October 2019 - Wine-Devel - list.winehq.org

[PATCH] testbot/Submit: Let the user pick the Wine build and language to test.
by Francois Gouget Oct. 3, 2019

Oct. 3, 2019

The Wine VMs are duplicated in the list, one entry per build, so the user can choose to test a patch or executable on one or all of the Wine builds. However the supported languages are presented in a drop-down list to keep the list size reasonable. So only one can be tested per Wine build. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Missions.pm | 34 ++- testbot/web/Submit.pl | 403 ++++++++++++++++++---------- 2 files changed, 300 insertions(+), 137 deletions(-) diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 65d8d82d3..4f8387542 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -27,7 +27,7 @@ WineTestBot::Missions - Missions parser and helper functions use Exporter 'import'; our @EXPORT = qw(DumpMissions GetMissionBaseName GetTaskMissionDescription - ParseMissionStatement + GetMissionCaps ParseMissionStatement MergeMissionStatementTasks SplitMissionStatementTasks); use WineTestBot::Utils; @@ -142,6 +142,38 @@ sub GetTaskMissionDescription($$) return $Description; } +sub GetMissionCaps($) +{ + my ($MissionStatement) = @_; + my $Capabilities = { build => {}, lang => {} }; + + # Extract capabilities from the mission statement + my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + if ($Missions) + { + foreach my $TaskMissions (@$Missions) + { + foreach my $Mission (@{$TaskMissions->{Missions}}) + { + my $Build = $Mission->{Build}; + $Capabilities->{build}->{$Build} = 1; + if ($Build =~ /^(?:win32|wow32|wow64)$/) + { + my $Lang = $Mission->{lang}; + $Capabilities->{lang}->{$Lang || "en_US"} = 1 if (defined $Lang); + } + } + } + } + if (%{$Capabilities->{lang}}) + { + # en_US is the default for Wine VMs and must always be supported + $Capabilities->{lang}->{"en_US"} = 1; + } + + return ($ErrMessage, $Capabilities); +} + sub MergeMissionStatementTasks($) { my ($MissionStatement) = @_; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index dc3fdca3d..bd3dc9fe1 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -42,6 +42,7 @@ use WineTestBot::PatchUtils; use WineTestBot::Steps; use WineTestBot::Utils; use WineTestBot::VMs; +use WineTestBot::Log; # @@ -226,11 +227,28 @@ sub _ValidateVMSelection($;$) return undef if (!$self->_GetFileType()); my @Deselected; + $self->{HasExe32} = $self->{HasExe64} = 0; + $self->{ShowRun32} = $self->{ShowRun64} = 1; foreach my $VMRow (@{$self->{VMRows}}) { - if ($self->{FileType} eq "exe64" and $VMRow->{VM}->Type eq "win32") + my $Incompatible; + my $Caps = $VMRow->{Caps}; + if ($self->{FileType} eq "exe32" and + (($VMRow->{Build} eq "vm" and !$Caps->{build}->{exe32}) # Windows + or $VMRow->{Build} eq "wow64")) # Wine + { + # This VM cannot / has no mission to run 32 bit executables + $Incompatible = 1; + } + elsif ($self->{FileType} eq "exe64" and + (($VMRow->{Build} eq "vm" and !$Caps->{build}->{exe64}) # Windows + or $VMRow->{Build} eq "win32" or $VMRow->{Build} eq "wow32")) # Wine + { + # This VM cannot / has no mission to run 64 bit executables + $Incompatible = 1; + } + if ($Incompatible) { - # This VM cannot run 64 bit executables $VMRow->{Incompatible} = 1; if ($VMRow->{Checked}) { @@ -243,21 +261,36 @@ sub _ValidateVMSelection($;$) push @Deselected, $VMRow->{VM}->Name; } } + next; } - else - { - delete $VMRow->{Incompatible}; - } + delete $VMRow->{Incompatible}; + # For Windows VMs record whether they will run 32/64 bit tests + $VMRow->{Exe32} = ($Caps->{build}->{exe32} and $self->{FileType} =~ /^(?:patch|exe32)$/); + $VMRow->{Exe64} = ($Caps->{build}->{exe64} and $self->{FileType} =~ /^(?:patch|exe64)$/); if ($VMRow->{Checked}) { # Count VMs so we can provide defaults or issue an error when needed $self->{CheckedVMCount}++; - # Set ShowRun64 if page 3 should offer to run both the 32 and 64 bit - # version of a patch. - $self->{ShowRun64} = 1 if ($VMRow->{VM}->Type eq "win64"); + if ($VMRow->{Exe32}) + { + $self->{HasExe32} = 1; + # The user picked a VM that only supports this bitness + # so disabling it would make no sense. + $self->{ShowRun32} = 0 if (!$VMRow->{Exe64}); + } + if ($VMRow->{Exe64}) + { + $self->{HasExe64} = 1; + # The user picked a VM that only supports this bitness + # so disabling it would make no sense. + $self->{ShowRun64} = 0 if (!$VMRow->{Exe32}); + } } } + $self->{ShowRun32} = 0 if (!$self->{HasExe32} or $self->{FileType} ne "patch"); + $self->{ShowRun64} = 0 if (!$self->{HasExe64} or $self->{FileType} ne "patch"); + if (@Deselected) { $self->{ErrMessage} = "The following VMs are incompatible and have been deselected: @Deselected"; @@ -390,6 +423,15 @@ sub Validate($) { return undef if (!$self->_ValidateTestExecutable()); + if ($self->{FileType} eq "patch" and + !$self->{Run32} and $self->{ShowRun32} and + !$self->{Run64} and $self->{ShowRun64}) + { + # Don't set ErrField since Run32 and Run64 may be hidden + $self->{ErrMessage} = "You must at least pick one of the 32 or 64 bit tests to run on the selected Windows VMs."; + return undef; + } + if ($self->{CmdLineArg} eq "" and !$self->{NoCmdLineArgWarn}) { $self->{ErrMessage} = "You did not specify a command line argument. ". @@ -442,18 +484,42 @@ sub _initialize($$$) foreach my $VMKey (@$SortedKeys) { my $VM = $VMs->GetItem($VMKey); - my $VMRow = { - VM => $VM, - Field => "vm_". $self->CGI->escapeHTML($VMKey), - Extra => $VM->Role ne "base", - }; - $VMRow->{Checked} = $self->GetParam($VMRow->{Field}); - push @{$self->{VMRows}}, $VMRow; + my ($ErrMessage, $Caps) = GetMissionCaps($VM->Missions); + LogMsg "$ErrMessage\n" if (defined $ErrMessage); + + my @Builds = $VM->Type eq "wine" ? keys %{$Caps->{build}} : ("vm"); + my $LangNames; + if (%{$Caps->{lang}}) + { + # Which languages are available for this row? + foreach my $Locale (keys %{$Caps->{lang}}) + { + $LangNames->{LocaleName($Locale)} = $Locale; + } + } + + my $FieldBase = $self->CGI->escapeHTML($VMKey); + foreach my $Build (sort @Builds) + { + my $VMRow = { + VM => $VM, + Build => $Build, + LangNames => $LangNames, + Caps => $Caps, + Field => "${Build}_$FieldBase", + Extra => $VM->Role ne "base", + }; + $VMRow->{Checked} = $self->GetParam($VMRow->{Field}); + $VMRow->{Lang} = $self->GetParam("$VMRow->{Field}_lang"); + $VMRow->{Lang} ||= "en_US" if ($LangNames); + + push @{$self->{VMRows}}, $VMRow; + } } # Load the Page 3 parameters $self->_GetParams("TestExecutable", "CmdLineArg", "NoCmdLineArgWarn", - "Run64", "DebugLevel", "ReportSuccessfulTests"); + "Run32", "Run64", "DebugLevel", "ReportSuccessfulTests"); $self->{DebugLevel} = 1 if (!defined $self->{DebugLevel}); # Load the Page 4 parameters @@ -504,6 +570,10 @@ sub _GenerateStateFields($) { print "<input type='hidden' name='$VMRow->{Field}' value='on'>\n"; } + if ($VMRow->{Lang}) + { + print "<input type='hidden' name='$VMRow->{Field}_lang' value='$VMRow->{Lang}'>\n"; + } } } if ($self->{Page} != 3) @@ -512,6 +582,7 @@ sub _GenerateStateFields($) # so he gets warned again. $self->_GenerateStateField("TestExecutable"); $self->_GenerateStateField("CmdLineArg"); + $self->_GenerateStateField("Run32"); $self->_GenerateStateField("Run64"); $self->_GenerateStateField("DebugLevel"); $self->_GenerateStateField("ReportSuccessfulTests"); @@ -624,7 +695,8 @@ sub GetPropertyDescriptors($) } push @{$self->{PropertyDescriptors}}, CreateBasicPropertyDescriptor("CmdLineArg", "Command line arguments", !1, !1, "A", 50), - CreateBasicPropertyDescriptor("Run64", "Run 64-bit tests in addition to 32-bit tests", !1, 1, "B", 1), + CreateBasicPropertyDescriptor("Run32", "Run the 32 bit tests on Windows", !1, 1, "B", 1), + CreateBasicPropertyDescriptor("Run64", "Run the 64 bit tests on Windows", !1, 1, "B", 1), CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1); } @@ -709,6 +781,7 @@ sub GenerateFields($) next if ($VMRow->{Extra} and !$VMRow->{Checked} and !$self->{ShowAll}); # By default select the base VMs that are ready to run tasks + # and are impacted by the patch or executable if (!$self->{UserVMSelection} and !$VMRow->{Extra} and $VMRow->{VM}->Status !~ /^(?:offline|maintenance)$/ and ($VMRow->{VM}->Type eq "wine" or !$self->{Impacts} or @@ -739,6 +812,7 @@ document.write("<input type='checkbox' onchange='SetAllVMCBs(this);'$MasterCheck EOF print "</th>\n"; print "<th class='Record'>VM Name</th>\n"; + print "<th class='Record'>Options</th>\n"; print "<th class='Record'>Description</th>\n"; print "</thead><tbody>\n"; @@ -756,7 +830,36 @@ EOF print " checked='checked'" if ($VMRow->{Checked}); print "/></td>\n"; - print "<td>", $self->CGI->escapeHTML($VM->Name), "</td>\n"; + my $Name = $VM->Name; + $Name .= " ($VMRow->{Build})" if ($VM->Type eq "wine"); + print "<td>", $self->CGI->escapeHTML($Name), "</td>\n"; + + print "<td>"; + if ($VMRow->{Exe32} and $VMRow->{Exe64}) + { + print "32 & 64 bits"; + } + elsif ($VMRow->{Exe32}) + { + print "32 bits"; + } + elsif ($VMRow->{Exe64}) + { + print "64 bits"; + } + if ($VMRow->{LangNames}) + { + print "<select name='$VMRow->{Field}_lang'>\n"; + foreach my $LangName (sort keys %{$VMRow->{LangNames}}) + { + my $Locale = $VMRow->{LangNames}->{$LangName}; + my $Selected = $Locale eq $VMRow->{Lang} ? " selected" : ""; + print "<option value='$Locale'$Selected>$LangName</option>\n"; + } + print "</select>"; + } + print "</td>\n"; + print "<td><details><summary>", $self->CGI->escapeHTML($VM->Description || $VM->Name); print " [", $VM->Status ,"]" if ($VM->Status =~ /^(?:offline|maintenance)$/); @@ -786,6 +889,10 @@ EOF $self->_GenerateStateField("NoCmdLineArgWarn"); # Preserve these fields if they are not shown + if (!$self->{ShowRun32} or $self->{FileType} ne "patch") + { + $self->_GenerateStateField("Run32"); + } if (!$self->{ShowRun64} or $self->{FileType} ne "patch") { $self->_GenerateStateField("Run64"); @@ -837,6 +944,10 @@ sub DisplayProperty($$) if ($self->{Page} == 3) { my $PropertyName = $PropertyDescriptor->GetName(); + if ($PropertyName eq "Run32") + { + return "" if (!$self->{ShowRun32} or $self->{FileType} ne "patch"); + } if ($PropertyName eq "Run64") { return "" if (!$self->{ShowRun64} or $self->{FileType} ne "patch"); @@ -902,11 +1013,14 @@ sub OnPage1Next($) return undef; } - # Set defaults - if (!defined $self->{Run64}) + # Set defaults: whether we show them or not the Run* defaults are true + foreach my $Bits (32, 64) { - # Whether we show it or not the default is true - $self->{Run64} = 1; + if (!defined $self->{"Run$Bits"} and !$self->{"ShowRun$Bits"} and + $self->{"HasExe$Bits"}) + { + $self->{"Run$Bits"} = 1; + } } $self->_SetPage(2); @@ -952,6 +1066,7 @@ sub OnPage3Prev($) my ($self) = @_; # Set to 0 instead of undef to record the user preference + $self->{Run32} ||= 0; $self->{Run64} ||= 0; $self->{ReportSuccessfulTests} ||= 0; @@ -980,138 +1095,154 @@ sub _SubmitJob($$) my $Steps = $NewJob->Steps; # Add steps and tasks for the 32 and 64 bit tests - my $BuildStep; - foreach my $Bits ("32", "64") + my $Impacts; + $Impacts = GetPatchImpacts($Staging) if ($self->{FileType} eq "patch"); + + # Extract the list of VMs and missions from the VM rows + my ($ExeVMs, @WineVMs, %WineMissions); + foreach my $VMRow (@{$self->{VMRows}}) { - next if ($Bits eq "32" && $self->{FileType} eq "exe64"); - next if ($Bits eq "64" && $self->{FileType} eq "exe32"); - next if ($Bits eq "64" && $self->{FileType} eq "patch" && !defined $self->{Run64}); + next if (!$VMRow->{Checked}); + # If LoadVMSelection() marked a VM as checked it means we have a task for + # it. So there is no need to further check $VM->Type / $self->{FileType}. - my $Tasks; - my $VMs = CreateVMs(); - $VMs->AddFilter("Type", $Bits eq "32" ? ["win32", "win64"] : ["win64"]); - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - foreach my $VMKey (@$SortedKeys) + my $VM = $VMRow->{VM}; + if ($VM->Type eq "wine") { - my $VM = $VMs->GetItem($VMKey); - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - next if (!$self->GetParam($FieldName)); # skip unselected VMs - - if (!$Tasks) + if ($WineMissions{$VM}) { - if (!$BuildStep and $self->{FileType} eq "patch") - { - # This is a patch so add a build step... - $BuildStep = $Steps->Add(); - $BuildStep->FileName($self->{FileName}); - $BuildStep->FileType($self->{FileType}); - $BuildStep->Type("build"); - $BuildStep->DebugLevel(0); - - # ...with a build task - my $VMs = CreateVMs(); - $VMs->AddFilter("Type", ["build"]); - $VMs->AddFilter("Role", ["base"]); - my $BuildVM = ${$VMs->GetItems()}[0]; - my $Task = $BuildStep->Tasks->Add(); - $Task->VM($BuildVM); - - my $MissionStatement = "exe32"; - $MissionStatement .= ":exe64" if (defined $self->{Run64}); - my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); - if (!defined $ErrMessage) - { - $Task->Timeout(GetBuildTimeout($self->{Impacts}, $Missions->[0])); - $Task->Missions($MissionStatement); - - # Save the build step so the others can reference it - (my $ErrKey, my $ErrProperty, $ErrMessage) = $Jobs->Save(); - } - if (defined $ErrMessage) - { - $self->{ErrMessage} = $ErrMessage; - return undef; - } - } - - # Then create the test step - my $TestStep = $Steps->Add(); - if ($self->{FileType} eq "patch") - { - $TestStep->PreviousNo($BuildStep->No); - my $TestExe = basename($self->{TestExecutable}); - $TestExe =~ s/_test\.exe$/_test64.exe/ if ($Bits eq "64"); - $TestStep->FileName($TestExe); - } - else - { - $TestStep->FileName($self->{FileName}); - } - $TestStep->FileType("exe$Bits"); - $TestStep->Type("single"); - $TestStep->DebugLevel($self->{DebugLevel}); - $TestStep->ReportSuccessfulTests(defined $self->{ReportSuccessfulTests}); - $Tasks = $TestStep->Tasks; + $WineMissions{$VM} .= ":$VMRow->{Build}"; + } + else + { + $WineMissions{$VM} = $VMRow->{Build}; + push @WineVMs, $VM; + } + if ($VMRow->{Lang} ne "en_US") + { + $WineMissions{$VM} .= ",lang=$VMRow->{Lang}"; + } + } + else + { + if ($VMRow->{Exe32} and ($self->{Run32} or !$self->{ShowRun32})) + { + push @{$ExeVMs->{32}}, $VM; + } + if ($VMRow->{Exe64} and ($self->{Run64} or !$self->{ShowRun64})) + { + push @{$ExeVMs->{64}}, $VM; } - - # Then add a task for this VM - my $Task = $Tasks->Add(); - $Task->VM($VM); - $Task->Timeout($SingleTimeout); - $Task->Missions("exe$Bits"); - $Task->CmdLineArg($self->{CmdLineArg}); } } - my ($Tasks, $MissionStatement, $Timeout); - my $VMs = CreateVMs(); - $VMs->AddFilter("Type", ["wine"]); - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - foreach my $VMKey (@$SortedKeys) + if ($ExeVMs->{32} or $ExeVMs->{64}) { - my $VM = $VMs->GetItem($VMKey); - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - next if (!$self->GetParam($FieldName)); # skip unselected VMs + my $BuildStep; + if ($self->{FileType} eq "patch") + { + # This is a patch so add a build step... + $BuildStep = $Steps->Add(); + $BuildStep->FileName($self->{FileName}); + $BuildStep->FileType($self->{FileType}); + $BuildStep->Type("build"); + $BuildStep->DebugLevel(0); + + # ...with a build task + my $VMs = CreateVMs(); + $VMs->AddFilter("Type", ["build"]); + $VMs->AddFilter("Role", ["base"]); + my $BuildVM = ${$VMs->GetItems()}[0]; + my $Task = $BuildStep->Tasks->Add(); + $Task->VM($BuildVM); + + my @Builds; + push @Builds, "exe32" if ($ExeVMs->{32}); + push @Builds, "exe64" if ($ExeVMs->{64}); + my ($ErrMessage, $Missions) = ParseMissionStatement(join(":", @Builds)); + if (!defined $ErrMessage) + { + $Task->Timeout(GetBuildTimeout($Impacts, $Missions->[0])); + $Task->Missions($Missions->[0]->{Statement}); - if (!$Tasks) + # Save the build step so the others can reference it + (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $Jobs->Save(); + } + if (defined $ErrMessage) + { + $self->{ErrMessage} = $ErrMessage; + return !1; + } + } + + foreach my $Bits (32, 64) { - # First create the Wine test step - my $WineStep = $Steps->Add(); - $WineStep->FileName($self->{FileName}); - $WineStep->FileType($self->{FileType}); - $WineStep->Type("single"); - $WineStep->DebugLevel($self->{DebugLevel}); - $WineStep->ReportSuccessfulTests(defined $self->GetParam("ReportSuccessfulTests")); - $Tasks = $WineStep->Tasks; - - $MissionStatement = ($self->{FileType} =~ /^(?:exe32|patch)$/) ? "win32" : ""; - if ($self->{FileType} eq "exe64" or - ($self->{FileType} eq "patch" and defined $self->{Run64})) + next if (!$ExeVMs->{$Bits}); + + # Create the test step + my $TestStep = $Steps->Add(); + if ($self->{FileType} eq "patch") + { + $TestStep->PreviousNo($BuildStep->No); + my $TestExe = $self->{TestExecutable}; + $TestExe =~ s/_test\.exe$/_test64.exe/ if ($Bits eq "64"); + $TestStep->FileName($TestExe); + } + else + { + $TestStep->FileName($self->{FileName}); + } + $TestStep->FileType("exe$Bits"); + $TestStep->Type("single"); + $TestStep->DebugLevel($self->{DebugLevel}); + $TestStep->ReportSuccessfulTests(defined $self->{ReportSuccessfulTests}); + my $Tasks = $TestStep->Tasks; + + # Add a task for each VM + foreach my $VM (@{$ExeVMs->{$Bits}}) { - $MissionStatement .= ":wow64"; + my $Task = $Tasks->Add(); + $Task->VM($VM); + $Task->Timeout($SingleTimeout); + $Task->Missions("exe$Bits"); + $Task->CmdLineArg($self->{CmdLineArg}); } - $MissionStatement =~ s/^://; + } + } + + if (@WineVMs) + { + # Create the Wine test step + my $WineStep = $Steps->Add(); + $WineStep->FileName($self->{FileName}); + $WineStep->FileType($self->{FileType}); + $WineStep->Type("single"); + $WineStep->DebugLevel($self->{DebugLevel}); + $WineStep->ReportSuccessfulTests(defined $self->{ReportSuccessfulTests}); + my $Tasks = $WineStep->Tasks; - my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + # Add a task for each VM + foreach my $VM (@WineVMs) + { + my ($ErrMessage, $Missions) = ParseMissionStatement($WineMissions{$VM}); if (defined $ErrMessage) { $self->{ErrMessage} = $ErrMessage; - return undef; + return !1; } - $Missions = $Missions->[0]; - $Timeout = $self->{FileType} ne "patch" ? - $SingleTimeout : - GetBuildTimeout($self->{Impacts}, $Missions) + - GetTestTimeout($self->{Impacts}, $Missions); - } + my $Missions = $Missions->[0]; + my $Timeout = $self->{FileType} ne "patch" ? + $SingleTimeout : + GetBuildTimeout($Impacts, $Missions) + + GetTestTimeout($Impacts, $Missions); - # Then add a task for this VM - my $Task = $Tasks->Add(); - $Task->VM($VM); - $Task->Timeout($Timeout); - $Task->Missions($MissionStatement); - my $Module = $self->{TestExecutables}->{$self->{TestExecutable}}; - $Task->CmdLineArg(($Module eq 1 ? "" : "$Module ") .$self->{CmdLineArg}); + my $Task = $Tasks->Add(); + $Task->VM($VM); + $Task->Timeout($Timeout); + $Task->Missions($WineMissions{$VM}); + my $Module = $self->{TestExecutables}->{$self->{TestExecutable}}; + $Task->CmdLineArg(($Module eq 1 ? "" : "$Module ") .$self->{CmdLineArg}); + } } # Now save it all (or whatever's left to save) -- 2.20.1

1 0

[PATCH 7/7] winex11.drv: Fix NoRes mode handler having an empty mode.
by Zhiyi Zhang Oct. 3, 2019

Oct. 3, 2019

After 25167fb286822c93582457815bcf069fef040976 get_primary_monitor_rect() returns an empty rectangle before X11DRV_DisplayDevices_Init() is called. So use get_host_primary_monitor_rect() to get the current X desktop size. It's also more intuitive this way. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 800b65dbfd..a4f172037c 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -146,7 +146,7 @@ static LONG X11DRV_nores_SetCurrentMode(int mode) /* default handler only gets the current X desktop resolution */ void X11DRV_Settings_Init(void) { - RECT primary = get_primary_monitor_rect(); + RECT primary = get_host_primary_monitor_rect(); X11DRV_Settings_SetHandlers("NoRes", X11DRV_nores_GetCurrentMode, X11DRV_nores_SetCurrentMode, -- 2.23.0

1 0

[PATCH 6/7] winex11.drv: Move the desktop fullscreen check after desktop init.
by Zhiyi Zhang Oct. 3, 2019

Oct. 3, 2019

After 25167fb286822c93582457815bcf069fef040976, get_primary_monitor_rect(), which is used in is_window_rect_fullscreen(), may return the primary screen size set by the last explorer instance if wineserver didn't fully shuts down. Also get_primary_monitor_rect() no longer reports the host primary monitor rect before virtual desktop initialization now. So move the desktop fullscreen check after desktop initialization so that primary screen size is updated and valid. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 9f2eb1d41f..1185874d46 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -286,7 +286,6 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) XSetWindowAttributes win_attr; Window win; Display *display = thread_init_display(); - RECT rect; WCHAR name[MAX_PATH]; if (!GetUserObjectInformationW( GetThreadDesktop( GetCurrentThreadId() ), @@ -313,18 +312,17 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) 0, 0, width, height, 0, default_visual.depth, InputOutput, default_visual.visual, CWEventMask | CWCursor | CWColormap, &win_attr ); if (!win) return FALSE; + if (!create_desktop_win_data( win )) return FALSE; - SetRect( &rect, 0, 0, width, height ); - if (is_window_rect_fullscreen( &rect )) + X11DRV_init_desktop( win, width, height ); + if (is_desktop_fullscreen()) { TRACE("setting desktop to fullscreen\n"); XChangeProperty( display, win, x11drv_atom(_NET_WM_STATE), XA_ATOM, 32, PropModeReplace, (unsigned char*)&x11drv_atom(_NET_WM_STATE_FULLSCREEN), 1); } - if (!create_desktop_win_data( win )) return FALSE; XFlush( display ); - X11DRV_init_desktop( win, width, height ); return TRUE; } -- 2.23.0

1 0

[PATCH 5/7] winex11.drv: Use POINT to keep offset.
by Zhiyi Zhang Oct. 3, 2019

Oct. 3, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/xinerama.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index dacc59fefb..eeb49b1af0 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -290,8 +290,8 @@ void xinerama_init( unsigned int width, unsigned int height ) { struct x11drv_display_device_handler handler; MONITORINFOEXW *primary; + POINT offset; int i; - RECT rect; if (is_virtual_desktop()) return; @@ -308,12 +308,12 @@ void xinerama_init( unsigned int width, unsigned int height ) primary = get_primary(); /* coordinates (0,0) have to point to the primary monitor origin */ - SetRect( &rect, 0, 0, width, height ); - OffsetRect( &rect, -primary->rcMonitor.left, -primary->rcMonitor.top ); + offset.x = -primary->rcMonitor.left; + offset.y = -primary->rcMonitor.top; for (i = 0; i < nb_monitors; i++) { - OffsetRect( &monitors[i].rcMonitor, rect.left, rect.top ); - OffsetRect( &monitors[i].rcWork, rect.left, rect.top ); + OffsetRect( &monitors[i].rcMonitor, offset.x, offset.y ); + OffsetRect( &monitors[i].rcWork, offset.x, offset.y ); TRACE( "monitor 0x%x: %s work %s%s\n", i, wine_dbgstr_rect(&monitors[i].rcMonitor), wine_dbgstr_rect(&monitors[i].rcWork), -- 2.23.0

1 0

[PATCH 4/7] winex11.drv: Get virtual desktop size limit from the host primary display.
by Zhiyi Zhang Oct. 3, 2019

Oct. 3, 2019

After 25167fb286822c93582457815bcf069fef040976, get_primary_monitor_rect() maybe invalid before display device initialization or returns the desktop rectangle after desktop initialization in virtual desktop mode, both of which are wrong. This fixes a regression from efbbe66669a060dd01b3ae399f5a9e7328312f03. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47815 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 8 +++----- dlls/winex11.drv/display.c | 21 +++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 7c2d4fd4bc..9f2eb1d41f 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -244,12 +244,14 @@ static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors ) */ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) { - RECT primary_rect; + RECT primary_rect = get_host_primary_monitor_rect(); root_window = win; managed_mode = FALSE; /* no managed windows in desktop mode */ desktop_width = width; desktop_height = height; + max_width = primary_rect.right; + max_height = primary_rect.bottom; /* Initialize virtual desktop mode display device handler */ desktop_handler.name = "Virtual Desktop"; @@ -262,10 +264,6 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) TRACE("Display device functions are now handled by: Virtual Desktop\n"); X11DRV_DisplayDevices_Init( TRUE ); - primary_rect = get_primary_monitor_rect(); - max_width = primary_rect.right - primary_rect.left; - max_height = primary_rect.bottom - primary_rect.top; - /* initialize the available resolutions */ dd_modes = X11DRV_Settings_SetHandlers("desktop", X11DRV_desktop_GetCurrentMode, diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index acf19bd8c6..31c652a300 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -133,6 +133,27 @@ RECT get_primary_monitor_rect(void) return primary_monitor_rect; } +/* Get the primary monitor rect from the host system */ +RECT get_host_primary_monitor_rect(void) +{ + INT gpu_count, adapter_count, monitor_count; + struct x11drv_gpu *gpus = NULL; + struct x11drv_adapter *adapters = NULL; + struct x11drv_monitor *monitors = NULL; + RECT rect = {0}; + + /* The first monitor is always primary */ + if (host_handler.pGetGpus(&gpus, &gpu_count) && gpu_count && + host_handler.pGetAdapters(gpus[0].id, &adapters, &adapter_count) && adapter_count && + host_handler.pGetMonitors(adapters[0].id, &monitors, &monitor_count) && monitor_count) + rect = monitors[0].rc_monitor; + + if (gpus) host_handler.pFreeGpus(gpus); + if (adapters) host_handler.pFreeAdapters(adapters); + if (monitors) host_handler.pFreeMonitors(monitors); + return rect; +} + void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) { if (new_handler->priority > host_handler.priority) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6ae9564858..9f024108f4 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -641,6 +641,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 RECT get_host_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; -- 2.23.0

1 0

[PATCH 3/7] winex11.drv: Use a separate virtual desktop display device handler.
by Zhiyi Zhang Oct. 3, 2019

Oct. 3, 2019

If we want to query host monitor dimensions, we need to use XRandR or Xinerama handler. However when in virtual desktop mode, its display device handler overrides other handlers. So we need to separate them. Then we can implement features that require host monitor dimensions like checking whether the virtual desktop window is fullscreen. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 109 ++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/display.c | 29 +++++----- dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/xinerama.c | 34 +++-------- 4 files changed, 132 insertions(+), 42 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index e4eb61f7bd..7c2d4fd4bc 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -27,9 +27,14 @@ /* avoid conflict with field names in included win32 headers */ #undef Status #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +struct x11drv_display_device_handler desktop_handler; +static unsigned int desktop_width; +static unsigned int desktop_height; + /* data for resolution changing */ static struct x11drv_mode_info *dd_modes; static unsigned int dd_mode_count; @@ -146,6 +151,92 @@ static LONG X11DRV_desktop_SetCurrentMode(int mode) return DISP_CHANGE_SUCCESSFUL; } +static void query_desktop_work_area( RECT *rc_work ) +{ + static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; + RECT rect; + HWND hwnd = FindWindowW( trayW, NULL ); + + if (!hwnd || !IsWindowVisible( hwnd )) return; + if (!GetWindowRect( hwnd, &rect )) return; + if (rect.top) rc_work->bottom = rect.top; + else rc_work->top = rect.bottom; + TRACE( "found tray %p %s work area %s\n", hwnd, wine_dbgstr_rect( &rect ), wine_dbgstr_rect( rc_work )); +} + +static BOOL X11DRV_desktop_get_gpus( struct x11drv_gpu **new_gpus, int *count ) +{ + static const WCHAR wine_adapterW[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; + struct x11drv_gpu *gpu; + + gpu = heap_calloc( 1, sizeof(*gpu) ); + if (!gpu) return FALSE; + + lstrcpyW( gpu->name, wine_adapterW ); + *new_gpus = gpu; + *count = 1; + return TRUE; +} + +static void X11DRV_desktop_free_gpus( struct x11drv_gpu *gpus ) +{ + heap_free( gpus ); +} + +/* FIXME: Support multi-head virtual desktop */ +static BOOL X11DRV_desktop_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new_adapters, int *count ) +{ + struct x11drv_adapter *adapter; + + if (gpu_id) return FALSE; + + adapter = heap_calloc( 1, sizeof(*adapter) ); + if (!adapter) return FALSE; + + adapter->state_flags = DISPLAY_DEVICE_PRIMARY_DEVICE; + if (desktop_width && desktop_height) + adapter->state_flags |= DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; + + *new_adapters = adapter; + *count = 1; + return TRUE; +} + +static void X11DRV_desktop_free_adapters( struct x11drv_adapter *adapters ) +{ + heap_free( adapters ); +} + +static BOOL X11DRV_desktop_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 *monitor; + + if (adapter_id) return FALSE; + + monitor = heap_calloc( 1, sizeof(*monitor) ); + if (!monitor) return FALSE; + + lstrcpyW( monitor->name, generic_nonpnp_monitorW ); + SetRect( &monitor->rc_monitor, 0, 0, desktop_width, desktop_height ); + SetRect( &monitor->rc_work, 0, 0, desktop_width, desktop_height ); + query_desktop_work_area( &monitor->rc_work ); + monitor->state_flags = DISPLAY_DEVICE_ATTACHED; + if (desktop_width && desktop_height) + monitor->state_flags |= DISPLAY_DEVICE_ACTIVE; + + *new_monitors = monitor; + *count = 1; + return TRUE; +} + +static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors ) +{ + heap_free( monitors ); +} + /*********************************************************************** * X11DRV_init_desktop * @@ -157,8 +248,18 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) root_window = win; managed_mode = FALSE; /* no managed windows in desktop mode */ - - xinerama_init( width, height ); + desktop_width = width; + desktop_height = height; + + /* Initialize virtual desktop mode display device handler */ + desktop_handler.name = "Virtual Desktop"; + desktop_handler.pGetGpus = X11DRV_desktop_get_gpus; + desktop_handler.pGetAdapters = X11DRV_desktop_get_adapters; + desktop_handler.pGetMonitors = X11DRV_desktop_get_monitors; + desktop_handler.pFreeGpus = X11DRV_desktop_free_gpus; + desktop_handler.pFreeAdapters = X11DRV_desktop_free_adapters; + desktop_handler.pFreeMonitors = X11DRV_desktop_free_monitors; + TRACE("Display device functions are now handled by: Virtual Desktop\n"); X11DRV_DisplayDevices_Init( TRUE ); primary_rect = get_primary_monitor_rect(); @@ -311,8 +412,8 @@ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) struct desktop_resize_data resize_data; resize_data.old_virtual_rect = get_virtual_screen_rect(); - - xinerama_init( width, height ); + desktop_width = width; + desktop_height = height; X11DRV_DisplayDevices_Init( TRUE ); resize_data.new_virtual_rect = get_virtual_screen_rect(); diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 107719a26f..acf19bd8c6 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -103,7 +103,7 @@ static const WCHAR monitor_hardware_idW[] = { 'M','O','N','I','T','O','R','\\', 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; -static struct x11drv_display_device_handler handler; +static struct x11drv_display_device_handler host_handler; static RECT virtual_screen_rect; static RECT primary_monitor_rect; @@ -135,10 +135,10 @@ RECT get_primary_monitor_rect(void) void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) { - if (new_handler->priority > handler.priority) + if (new_handler->priority > host_handler.priority) { - handler = *new_handler; - TRACE("Display device functions are now handled by: %s\n", handler.name); + host_handler = *new_handler; + TRACE("Display device functions are now handled by: %s\n", host_handler.name); } } @@ -433,6 +433,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) { static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; + struct x11drv_display_device_handler *handler; struct x11drv_gpu *gpus = NULL; struct x11drv_adapter *adapters = NULL; struct x11drv_monitor *monitors = NULL; @@ -445,6 +446,8 @@ void X11DRV_DisplayDevices_Init(BOOL force) WCHAR guidW[40]; WCHAR driverW[1024]; + handler = is_virtual_desktop() ? &desktop_handler : &host_handler; + mutex = CreateMutexW(NULL, FALSE, init_mutexW); WaitForSingleObject(mutex, INFINITE); @@ -462,7 +465,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; } - TRACE("via %s\n", wine_dbgstr_a(handler.name)); + TRACE("via %s\n", wine_dbgstr_a(handler->name)); prepare_devices(video_hkey); @@ -470,7 +473,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) monitor_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); /* Initialize GPUs */ - if (!handler.pGetGpus(&gpus, &gpu_count)) + if (!handler->pGetGpus(&gpus, &gpu_count)) goto done; TRACE("GPU count: %d\n", gpu_count); @@ -480,13 +483,13 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; /* Initialize adapters */ - if (!handler.pGetAdapters(gpus[gpu].id, &adapters, &adapter_count)) + if (!handler->pGetAdapters(gpus[gpu].id, &adapters, &adapter_count)) goto done; TRACE("GPU: %#lx %s, adapter count: %d\n", gpus[gpu].id, wine_dbgstr_w(gpus[gpu].name), adapter_count); for (adapter = 0; adapter < adapter_count; adapter++) { - if (!handler.pGetMonitors(adapters[adapter].id, &monitors, &monitor_count)) + if (!handler->pGetMonitors(adapters[adapter].id, &monitors, &monitor_count)) goto done; TRACE("adapter: %#lx, monitor count: %d\n", adapters[adapter].id, monitor_count); @@ -502,12 +505,12 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; } - handler.pFreeMonitors(monitors); + handler->pFreeMonitors(monitors); monitors = NULL; video_index++; } - handler.pFreeAdapters(adapters); + handler->pFreeAdapters(adapters); adapters = NULL; } @@ -522,9 +525,9 @@ done: ReleaseMutex(mutex); CloseHandle(mutex); if (gpus) - handler.pFreeGpus(gpus); + handler->pFreeGpus(gpus); if (adapters) - handler.pFreeAdapters(adapters); + handler->pFreeAdapters(adapters); if (monitors) - handler.pFreeMonitors(monitors); + handler->pFreeMonitors(monitors); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index cd2450e4b1..6ae9564858 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -746,6 +746,8 @@ struct x11drv_display_device_handler extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_Init(BOOL force) DECLSPEC_HIDDEN; +/* Display devices handler used in virtual desktop mode */ +extern struct x11drv_display_device_handler desktop_handler DECLSPEC_HIDDEN; /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index ed5ec22315..dacc59fefb 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -75,20 +75,6 @@ void query_work_area( RECT *rc_work ) } } -static void query_desktop_work_area( RECT *rc_work ) -{ - static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; - RECT rect; - HWND hwnd = FindWindowW( trayW, NULL ); - - if (!hwnd || !IsWindowVisible( hwnd )) return; - if (!GetWindowRect( hwnd, &rect )) return; - if (rect.top) rc_work->bottom = rect.top; - else rc_work->top = rect.bottom; - TRACE( "found tray %p %s work area %s\n", hwnd, - wine_dbgstr_rect( &rect ), wine_dbgstr_rect( rc_work )); -} - #ifdef SONAME_LIBXINERAMA #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -304,27 +290,25 @@ void xinerama_init( unsigned int width, unsigned int height ) { struct x11drv_display_device_handler handler; MONITORINFOEXW *primary; - BOOL desktop_mode = FALSE; int i; RECT rect; - SetRect( &rect, 0, 0, width, height ); + if (is_virtual_desktop()) + return; - if (is_virtual_desktop() || !query_screens()) + if (!query_screens()) { - default_monitor.rcWork = default_monitor.rcMonitor = rect; - if (!is_virtual_desktop()) - query_work_area( &default_monitor.rcWork ); - else - query_desktop_work_area( &default_monitor.rcWork ); + SetRect( &default_monitor.rcMonitor, 0, 0, width, height ); + SetRect( &default_monitor.rcWork, 0, 0, width, height ); + query_work_area( &default_monitor.rcWork ); nb_monitors = 1; monitors = &default_monitor; - desktop_mode = TRUE; } primary = get_primary(); /* coordinates (0,0) have to point to the primary monitor origin */ + SetRect( &rect, 0, 0, width, height ); OffsetRect( &rect, -primary->rcMonitor.left, -primary->rcMonitor.top ); for (i = 0; i < nb_monitors; i++) { @@ -336,8 +320,8 @@ void xinerama_init( unsigned int width, unsigned int height ) (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } - handler.name = desktop_mode ? "Desktop" : "Xinerama"; - handler.priority = desktop_mode ? 1000 : 100; + handler.name = "Xinerama"; + handler.priority = 100; handler.pGetGpus = xinerama_get_gpus; handler.pGetAdapters = xinerama_get_adapters; handler.pGetMonitors = xinerama_get_monitors; -- 2.23.0

1 0

[PATCH 2/7] winex11.drv: Introduce is_virtual_desktop().
by Zhiyi Zhang Oct. 3, 2019

Oct. 3, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 8 +++++++- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/mouse.c | 2 +- dlls/winex11.drv/palette.c | 2 +- dlls/winex11.drv/systray.c | 2 +- dlls/winex11.drv/window.c | 4 ++-- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xinerama.c | 4 ++-- dlls/winex11.drv/xrandr.c | 2 +- dlls/winex11.drv/xvidmode.c | 2 +- 10 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index fed8dd32e9..e4eb61f7bd 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -77,6 +77,12 @@ static struct screen_size { #define _NET_WM_STATE_REMOVE 0 #define _NET_WM_STATE_ADD 1 +/* Return TRUE if Wine is currently in virtual desktop mode */ +BOOL is_virtual_desktop(void) +{ + return root_window != DefaultRootWindow( gdi_display ); +} + /* create the mode structures */ static void make_modes(void) { @@ -268,7 +274,7 @@ static void update_desktop_fullscreen( unsigned int width, unsigned int height) Display *display = thread_display(); XEvent xev; - if (!display || root_window == DefaultRootWindow( display )) return; + if (!display || !is_virtual_desktop()) return; xev.xclient.type = ClientMessage; xev.xclient.window = root_window; diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 25730192d3..dd8837c11d 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -827,7 +827,7 @@ static void focus_out( Display *display , HWND hwnd ) x11drv_thread_data()->last_focus = hwnd; if ((xic = X11DRV_get_ic( hwnd ))) XUnsetICFocus( xic ); - if (root_window != DefaultRootWindow(display)) + if (is_virtual_desktop()) { if (hwnd == GetDesktopWindow()) reset_clipping_window(); return; diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 15e5c04a41..290732fa93 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -572,7 +572,7 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) { RECT virtual_rect = get_virtual_screen_rect(); if (!EqualRect( &rect, &virtual_rect )) return FALSE; - if (root_window != DefaultRootWindow( gdi_display )) return FALSE; + if (is_virtual_desktop()) return FALSE; } TRACE( "win %p clipping fullscreen\n", hwnd ); return grab_clipping_window( &rect ); diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index bba2253264..9974ce7ecc 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -217,7 +217,7 @@ int X11DRV_PALETTE_Init(void) { X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_PRIVATE; - if( root_window != DefaultRootWindow(gdi_display) ) + if (is_virtual_desktop()) { win_attr.colormap = default_colormap; XChangeWindowAttributes( gdi_display, root_window, CWColormap, &win_attr ); diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index d4262c43cf..3be4bd6534 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -587,7 +587,7 @@ static BOOL init_systray(void) WNDCLASSEXW class; Display *display; - if (root_window != DefaultRootWindow( gdi_display )) return FALSE; + if (is_virtual_desktop()) return FALSE; if (init_done) return TRUE; icon_cx = GetSystemMetrics( SM_CXSMICON ) + 2 * ICON_BORDER; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4e01eb201c..f0d6fe64ad 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2473,7 +2473,7 @@ static BOOL hide_icon( struct x11drv_win_data *data ) if (data->managed) return TRUE; /* hide icons in desktop mode when the taskbar is active */ - if (root_window == DefaultRootWindow( gdi_display )) return FALSE; + if (!is_virtual_desktop()) return FALSE; return IsWindowVisible( FindWindowW( trayW, NULL )); } @@ -2780,7 +2780,7 @@ static BOOL is_netwm_supported( Display *display, Atom atom ) */ static LRESULT start_screensaver(void) { - if (root_window == DefaultRootWindow(gdi_display)) + if (!is_virtual_desktop()) { const char *argv[3] = { "xdg-screensaver", "activate", NULL }; int pid = _spawnvp( _P_DETACH, argv[0], argv ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 135faa8989..cd2450e4b1 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -652,6 +652,7 @@ struct x11drv_mode_info unsigned int refresh_rate; }; +extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN; extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; extern void X11DRV_resize_desktop(unsigned int width, unsigned int height) DECLSPEC_HIDDEN; extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 61c422e835..ed5ec22315 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -310,10 +310,10 @@ void xinerama_init( unsigned int width, unsigned int height ) SetRect( &rect, 0, 0, width, height ); - if (root_window != DefaultRootWindow( gdi_display ) || !query_screens()) + if (is_virtual_desktop() || !query_screens()) { default_monitor.rcWork = default_monitor.rcMonitor = rect; - if (root_window == DefaultRootWindow( gdi_display )) + if (!is_virtual_desktop()) query_work_area( &default_monitor.rcWork ); else query_desktop_work_area( &default_monitor.rcWork ); diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 6bb2b18ce7..06cf371353 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1078,7 +1078,7 @@ void X11DRV_XRandR_Init(void) if (major) return; /* already initialized? */ if (!usexrandr) return; /* disabled in config */ - if (root_window != DefaultRootWindow( gdi_display )) return; + if (is_virtual_desktop()) return; if (!(ret = load_xrandr())) return; /* can't load the Xrandr library */ /* see if Xrandr is available */ diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 9c0c97f1eb..7d8835a052 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -210,7 +210,7 @@ void X11DRV_XF86VM_Init(void) #endif /* X_XF86VidModeSetGammaRamp */ /* retrieve modes */ - if (usexvidmode && root_window == DefaultRootWindow( gdi_display )) + if (usexvidmode && !is_virtual_desktop()) { X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); ok = pXF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &nmodes, &real_xf86vm_modes); -- 2.23.0

1 0

[PATCH 2/2] kernel32: Handle GEOCLASS_REGION in Get/SetUserGeoID.
by João Diogo Ferreira Oct. 3, 2019

Oct. 3, 2019

This is laying the groundwork for implementing GeoID autodetection on behalf of the user. These functions should now be 100% compliant with Windows 7 behaviour. Only a few more ways to make it behave like Windows 10! Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- dlls/kernel32/locale.c | 77 ++++++++++++++++++++++++++++++++---------- 1 file changed, 59 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index d11d17eaa0..e017bb5472 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4778,34 +4778,43 @@ static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid) /****************************************************************************** * GetUserGeoID (KERNEL32.@) + * Fetches the user's geographic location ID for nation or region. + * + * PARAMS + * GeoClass [I] One of GEOCLASS_NATION or GEOCLASS_REGION. + * + * RETURNS + * Success: The GeoID for the requested class. + * Failure: GEOID_NOT_AVAILABLE, if the specified GeoClass is invalid or its GeoID had not yet been set. + * */ GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) { GEOID ret = GEOID_NOT_AVAILABLE; static const WCHAR geoW[] = {'G','e','o',0}; static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; + static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; WCHAR bufferW[40], *end; DWORD count; HANDLE hkey, hSubkey = 0; UNICODE_STRING keyW; const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)bufferW; - RtlInitUnicodeString( &keyW, nationW ); count = sizeof(bufferW); - if(!(hkey = create_registry_key())) return ret; + if (GeoClass == GEOCLASS_NATION) + RtlInitUnicodeString( &keyW, nationW ); + else if (GeoClass == GEOCLASS_REGION) + RtlInitUnicodeString( &keyW, regionW ); + else + return ret; - switch( GeoClass ){ - case GEOCLASS_NATION: - if ((hSubkey = NLS_RegOpenKey(hkey, geoW))) - { - if((NtQueryValueKey(hSubkey, &keyW, KeyValuePartialInformation, - bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength) - ret = strtolW((LPCWSTR)info->Data, &end, 10); - } - break; - case GEOCLASS_REGION: - FIXME("GEOCLASS_REGION not handled yet\n"); - break; + if (!(hkey = create_registry_key())) return ret; + + if ((hSubkey = NLS_RegOpenKey(hkey, geoW))) + { + if((NtQueryValueKey(hSubkey, &keyW, KeyValuePartialInformation, + bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength) + ret = strtolW((LPCWSTR)info->Data, &end, 10); } NtClose(hkey); @@ -4815,18 +4824,46 @@ GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) /****************************************************************************** * SetUserGeoID (KERNEL32.@) + * Sets the user's geographic location ID. + * + * PARAMS + * GeoID [I] The new GeoID. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE, if the GeoID was invalid or an unexpected error occured. Call GetLastError() to learn the reason. + * + * NOTES + * GetLastError() will report the following possible error conditions: + * - ERROR_INVALID_PARAMETER: The GeoID was invalid. + * - ERROR_INTERNAL_ERROR: There was an unexpected error. + * + * GeoIDs may be internally classified as LOCATION_BOTH; these are functionally identical to GEOCLASS_REGION, + * and will be set as region ID only, not as a nation. + * */ BOOL WINAPI SetUserGeoID( GEOID GeoID ) { + const struct geoinfo_t *geoinfo = get_geoinfo_dataptr(GeoID); static const WCHAR geoW[] = {'G','e','o',0}; static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; + static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; static const WCHAR formatW[] = {'%','i',0}; UNICODE_STRING nameW,keyW; WCHAR bufferW[10]; OBJECT_ATTRIBUTES attr; HANDLE hkey; - if(!(hkey = create_registry_key())) return FALSE; + if (!geoinfo) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (!(hkey = create_registry_key())) + { + SetLastError(ERROR_INTERNAL_ERROR); + return FALSE; + } attr.Length = sizeof(attr); attr.RootDirectory = hkey; @@ -4835,16 +4872,20 @@ BOOL WINAPI SetUserGeoID( GEOID GeoID ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; RtlInitUnicodeString( &nameW, geoW ); - RtlInitUnicodeString( &keyW, nationW ); - if (NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) != STATUS_SUCCESS) + if (geoinfo->kind == LOCATION_NATION) + RtlInitUnicodeString( &keyW, nationW ); + else + RtlInitUnicodeString( &keyW, regionW ); + if (NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) != STATUS_SUCCESS) { NtClose(attr.RootDirectory); + SetLastError(ERROR_INTERNAL_ERROR); return FALSE; } - sprintfW(bufferW, formatW, GeoID); + sprintfW(bufferW, formatW, geoinfo->id); NtSetValueKey(hkey, &keyW, 0, REG_SZ, bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR)); NtClose(attr.RootDirectory); NtClose(hkey); -- 2.23.0

1 0

[PATCH 1/2] kernel32: Move Get/SetUserGeoID() downards
by João Diogo Ferreira Oct. 3, 2019

Oct. 3, 2019

I need them to access the geoinfodata array. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- dlls/kernel32/locale.c | 150 ++++++++++++++++++++--------------------- 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index f4a76b4c96..d11d17eaa0 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4345,81 +4345,6 @@ BOOL WINAPI InvalidateNLSCache(void) return FALSE; } -/****************************************************************************** - * GetUserGeoID (KERNEL32.@) - */ -GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) -{ - GEOID ret = GEOID_NOT_AVAILABLE; - static const WCHAR geoW[] = {'G','e','o',0}; - static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; - WCHAR bufferW[40], *end; - DWORD count; - HANDLE hkey, hSubkey = 0; - UNICODE_STRING keyW; - const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)bufferW; - RtlInitUnicodeString( &keyW, nationW ); - count = sizeof(bufferW); - - if(!(hkey = create_registry_key())) return ret; - - switch( GeoClass ){ - case GEOCLASS_NATION: - if ((hSubkey = NLS_RegOpenKey(hkey, geoW))) - { - if((NtQueryValueKey(hSubkey, &keyW, KeyValuePartialInformation, - bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength) - ret = strtolW((LPCWSTR)info->Data, &end, 10); - } - break; - case GEOCLASS_REGION: - FIXME("GEOCLASS_REGION not handled yet\n"); - break; - } - - NtClose(hkey); - if (hSubkey) NtClose(hSubkey); - return ret; -} - -/****************************************************************************** - * SetUserGeoID (KERNEL32.@) - */ -BOOL WINAPI SetUserGeoID( GEOID GeoID ) -{ - static const WCHAR geoW[] = {'G','e','o',0}; - static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; - static const WCHAR formatW[] = {'%','i',0}; - UNICODE_STRING nameW,keyW; - WCHAR bufferW[10]; - OBJECT_ATTRIBUTES attr; - HANDLE hkey; - - if(!(hkey = create_registry_key())) return FALSE; - - attr.Length = sizeof(attr); - attr.RootDirectory = hkey; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &nameW, geoW ); - RtlInitUnicodeString( &keyW, nationW ); - - if (NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) != STATUS_SUCCESS) - - { - NtClose(attr.RootDirectory); - return FALSE; - } - - sprintfW(bufferW, formatW, GeoID); - NtSetValueKey(hkey, &keyW, 0, REG_SZ, bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR)); - NtClose(attr.RootDirectory); - NtClose(hkey); - return TRUE; -} - typedef struct { union @@ -4851,6 +4776,81 @@ static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid) return NULL; } +/****************************************************************************** + * GetUserGeoID (KERNEL32.@) + */ +GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) +{ + GEOID ret = GEOID_NOT_AVAILABLE; + static const WCHAR geoW[] = {'G','e','o',0}; + static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; + WCHAR bufferW[40], *end; + DWORD count; + HANDLE hkey, hSubkey = 0; + UNICODE_STRING keyW; + const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)bufferW; + RtlInitUnicodeString( &keyW, nationW ); + count = sizeof(bufferW); + + if(!(hkey = create_registry_key())) return ret; + + switch( GeoClass ){ + case GEOCLASS_NATION: + if ((hSubkey = NLS_RegOpenKey(hkey, geoW))) + { + if((NtQueryValueKey(hSubkey, &keyW, KeyValuePartialInformation, + bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength) + ret = strtolW((LPCWSTR)info->Data, &end, 10); + } + break; + case GEOCLASS_REGION: + FIXME("GEOCLASS_REGION not handled yet\n"); + break; + } + + NtClose(hkey); + if (hSubkey) NtClose(hSubkey); + return ret; +} + +/****************************************************************************** + * SetUserGeoID (KERNEL32.@) + */ +BOOL WINAPI SetUserGeoID( GEOID GeoID ) +{ + static const WCHAR geoW[] = {'G','e','o',0}; + static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; + static const WCHAR formatW[] = {'%','i',0}; + UNICODE_STRING nameW,keyW; + WCHAR bufferW[10]; + OBJECT_ATTRIBUTES attr; + HANDLE hkey; + + if(!(hkey = create_registry_key())) return FALSE; + + attr.Length = sizeof(attr); + attr.RootDirectory = hkey; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, geoW ); + RtlInitUnicodeString( &keyW, nationW ); + + if (NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) != STATUS_SUCCESS) + + { + NtClose(attr.RootDirectory); + return FALSE; + } + + sprintfW(bufferW, formatW, GeoID); + NtSetValueKey(hkey, &keyW, 0, REG_SZ, bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR)); + NtClose(attr.RootDirectory); + NtClose(hkey); + return TRUE; +} + /****************************************************************************** * GetGeoInfoW (KERNEL32.@) */ -- 2.23.0

1 0

[PATCH 1/2] winnls.h: Add useless element GEOCLASS_ALL to enum SYSGEOCLASS.
by João Diogo Ferreira Oct. 3, 2019

Oct. 3, 2019

This is a seemingly useless value that's available since Windows 8, according to MSDN. I took its value from mingw-w64, and they define it as 0. All the Windows functions that I've tested fail when called with this argument. Nevertheless, it remains a (technically) valid argument to be used with a few functions, such as GetUserGeoID. So I decided to add this case to WineTest, so we can be sure that it remains a useless value indeed :) For this reason, I added this value to Wine's headers. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- include/winnls.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnls.h b/include/winnls.h index e790da4832..e810c44af7 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -833,6 +833,7 @@ enum SYSGEOTYPE enum SYSGEOCLASS { + GEOCLASS_ALL = 0, GEOCLASS_REGION = 14, GEOCLASS_NATION = 16 }; -- 2.23.0

1 0