mirror of
https://github.com/ChrisTitusTech/winutil.git
synced 2026-08-10 10:01:16 +10:00
Phuc ToandGitHub
6de45a38b9
* Make UI helpers no-op when no window exists The -Preset and -Config paths run Invoke-WinUtilAutoRun before the XAML form is created and before PresentationCore is loaded, so every call into Invoke-WPFUIThread failed with InvokeMethodOnNull and every call into Set-WinUtilTweaksProgressIndicator failed to resolve [Windows.Visibility]. The errors were non-terminating, so tweaks still applied, but each run filled the log with noise. Loading presentationframework earlier does not help: Visibility lives in PresentationCore, which only loads once a WPF object is instantiated, and the XAML-named progress controls do not exist in these paths either. Guarding the two helpers covers Invoke-WPFtweaksbutton, Invoke-WPFundoall and Invoke-WPFFeatureInstall, which the existing per-call-site $hasUI convention never reached. * Suppress stray console output from automation runs Invoke-WPFRunspace returns an IAsyncResult that no caller uses, and Set-WinUtilRegistry was the only New-PSDrive call site that did not suppress its output. A GUI click handler discards both, but the -Preset and -Config paths call the workflows directly, so an async handle dump and a PSDrive table landed in the user's log. The handle itself is kept because pester/runspace.Tests.ps1 asserts that Invoke-WPFRunspace returns a single IAsyncResult, so the suppression goes at the four call sites reachable from Invoke-WinUtilAutoRun. * Add project learning for window-free UI helpers
93 lines
4.1 KiB
PowerShell
93 lines
4.1 KiB
PowerShell
function Invoke-WPFtweaksbutton {
|
|
<#
|
|
|
|
.SYNOPSIS
|
|
Invokes the functions associated with each group of checkboxes
|
|
|
|
#>
|
|
|
|
if($sync.ProcessRunning) {
|
|
$msg = "[Invoke-WPFtweaksbutton] Install process is currently running."
|
|
[System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
|
|
return
|
|
}
|
|
|
|
$Tweaks = $sync.selectedTweaks
|
|
$dnsProvider = $sync["WPFchangedns"].text
|
|
if (-not ($dnsProvider)) {
|
|
$dnsProvider = "Default"
|
|
}
|
|
$restorePointTweak = "WPFTweaksRestorePoint"
|
|
$restorePointSelected = $Tweaks -contains $restorePointTweak
|
|
$tweaksToRun = @($Tweaks | Where-Object { $_ -ne $restorePointTweak })
|
|
$totalSteps = [Math]::Max($Tweaks.Count, 1)
|
|
$completedSteps = 0
|
|
Write-WinUtilLog -Component "Tweaks" -Message "Tweaks requested: $(@($Tweaks).Count) selected tweak(s), DNS provider: $dnsProvider"
|
|
|
|
if ($tweaks.count -eq 0 -and $dnsProvider -eq "Default") {
|
|
$msg = "Please check the tweaks you wish to perform."
|
|
[System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
|
|
return
|
|
}
|
|
|
|
if ($restorePointSelected) {
|
|
$sync.ProcessRunning = $true
|
|
|
|
if ($Tweaks.Count -eq 1) {
|
|
Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" }
|
|
} else {
|
|
Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" }
|
|
}
|
|
|
|
Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Creating restore point" -Percent 0
|
|
Write-WinUtilLog -Component "Tweaks" -Message "Creating restore point before applying selected tweaks."
|
|
Invoke-WinUtilTweaks $restorePointTweak
|
|
$completedSteps = 1
|
|
|
|
if ($tweaksToRun.Count -eq 0 -and $dnsProvider -eq "Default") {
|
|
Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Tweaks finished" -Percent 100
|
|
$sync.ProcessRunning = $false
|
|
Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" }
|
|
Write-Host "================================="
|
|
Write-Host "-- Tweaks are Finished ---"
|
|
Write-Host "================================="
|
|
Write-WinUtilLog -Component "Tweaks" -Message "Tweaks workflow completed after restore point."
|
|
return
|
|
}
|
|
}
|
|
|
|
# The leading "," in the ParameterList is necessary because we only provide one argument and powershell cannot be convinced that we want a nested loop with only one argument otherwise
|
|
Invoke-WPFRunspace -ParameterList @(("tweaks", $tweaksToRun), ("dnsProvider", $dnsProvider), ("completedSteps", $completedSteps), ("totalSteps", $totalSteps)) -ScriptBlock {
|
|
param($tweaks, $dnsProvider, $completedSteps, $totalSteps)
|
|
|
|
$sync.ProcessRunning = $true
|
|
|
|
if ($completedSteps -eq 0) {
|
|
if ($Tweaks.count -eq 1) {
|
|
Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" }
|
|
} else {
|
|
Invoke-WPFUIThread -ScriptBlock{ Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" }
|
|
}
|
|
}
|
|
|
|
if ($dnsProvider -ne "Default") {
|
|
Set-WinUtilDNS -DNSProvider $dnsProvider
|
|
}
|
|
|
|
for ($i = 0; $i -lt $tweaks.Count; $i++) {
|
|
Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Applying $($tweaks[$i]) ($($completedSteps + 1)/$totalSteps)" -Percent ($completedSteps / $totalSteps * 100)
|
|
Invoke-WinUtilTweaks $tweaks[$i]
|
|
$completedSteps++
|
|
$progress = $completedSteps / $totalSteps
|
|
Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -value $progress }
|
|
}
|
|
Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Tweaks finished" -Percent 100
|
|
$sync.ProcessRunning = $false
|
|
Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" }
|
|
Write-Host "================================="
|
|
Write-Host "-- Tweaks are Finished ---"
|
|
Write-Host "================================="
|
|
Write-WinUtilLog -Component "Tweaks" -Message "Tweaks workflow completed."
|
|
} | Out-Null
|
|
}
|