Add -Locale option and fix encoding for error handling

* Since Microsoft removed the ISOs from their servers
* Closes #64

.editorconfig

@@ -2,7 +2,8 @@
 root = true
 
 [*]
-trim_trailing_whitespace = true
-insert_final_newline = true
 # Must use a BOM else Unicode strings will not display
 charset = utf-8-bom
+insert_final_newline = true
+indent_style = tab
+trim_trailing_whitespace = true

.gitattributes

@@ -1,3 +1,6 @@
 * text=auto
 *.ps1  eol=crlf
 *.sh   eol=lf
+.gitattributes export-ignore
+.gitignore     export-ignore
+sign.sh        export-ignore

.whitesource

@@ -1,8 +0,0 @@
-{
-  "checkRunSettings": {
-    "vulnerableCheckRunConclusionLevel": "failure"
-  },
-  "issueSettings": {
-    "minSeverityLevel": "LOW"
-  }
-}

Fido.ps1

@@ -1,6 +1,6 @@
 #
-# Fido v1.32 - Feature ISO Downloader, for retail Windows images and UEFI Shell
-# Copyright © 2019-2022 Pete Batard <pete@akeo.ie>
+# Fido v1.46 - Feature ISO Downloader, for retail Windows images and UEFI Shell
+# Copyright © 2019-2023 Pete Batard <pete@akeo.ie>
 # Command line support: Copyright © 2021 flx5
 # ConvertTo-ImageSource: Copyright © 2016 Chris Carter
 #
@@ -24,9 +24,11 @@
 #region Parameters
 param(
 	# (Optional) The title to display on the application window.
-	[string]$AppTitle = "Fido - Retail Windows ISO Downloader",
+	[string]$AppTitle = "Fido - Feature ISO Downloader",
 	# (Optional) '|' separated UI localization strings.
 	[string]$LocData,
+	# (Optional) Forced locale
+	[string]$Locale = "en-US",
 	# (Optional) Path to a file that should be used for the UI icon.
 	[string]$Icon,
 	# (Optional) Name of a pipe the download URL should be sent to.
@@ -43,9 +45,9 @@ param(
 	# (Optional) Specify Windows architecture [Toggles commandline mode]
 	[string]$Arch,
 	# (Optional) Only display the download URL [Toggles commandline mode]
-	[switch]$GetUrl = $False,
+	[switch]$GetUrl = $false,
 	# (Optional) Increase verbosity
-	[switch]$Verbose = $False
+	[switch]$Verbose = $false
 )
 #endregion
 
@@ -53,41 +55,78 @@ try {
 	[Console]::OutputEncoding = [System.Text.Encoding]::UTF8
 } catch {}
 
-$Cmd = $False
+$Cmd = $false
 if ($Win -or $Rel -or $Ed -or $Lang -or $Arch -or $GetUrl) {
-	$Cmd = $True
+	$Cmd = $true
+}
+
+# Return a decimal Windows version that we can then check for platform support.
+# Note that because we don't want to have to support this script on anything
+# other than Windows, this call returns 0.0 for PowerShell running on Linux/Mac.
+function Get-Platform-Version()
+{
+	$version = 0.0
+	$platform = [string][System.Environment]::OSVersion.Platform
+	# This will filter out non Windows platforms
+	if ($platform.StartsWith("Win")) {
+		# Craft a decimal numeric version of Windows
+		$version = [System.Environment]::OSVersion.Version.Major * 1.0 + [System.Environment]::OSVersion.Version.Minor * 0.1
+	}
+	return $version
+}
+
+$winver = Get-Platform-Version
+
+# The default TLS for Windows 8.x doesn't work with Microsoft's servers so we must force it
+if ($winver -lt 10.0) {
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls -bor [Net.SecurityProtocolType]::Tls11 -bor [Net.SecurityProtocolType]::Tls12
 }
 
 #region Assembly Types
-$code = @"
-[DllImport("shell32.dll", CharSet = CharSet.Auto, SetLastError = true, BestFitMapping = false, ThrowOnUnmappableChar = true)]
-	internal static extern int ExtractIconEx(string sFile, int iIndex, out IntPtr piLargeVersion, out IntPtr piSmallVersion, int amountIcons);
-[DllImport("user32.dll")]
-	public static extern bool ShowWindow(IntPtr handle, int state);
+$Drawing_Assembly = "System.Drawing"
+# PowerShell 7 altered the name of the Drawing assembly...
+if ($host.version -ge "7.0") {
+	$Drawing_Assembly += ".Common"
+}
 
-	// Extract an icon from a DLL
-	public static Icon ExtractIcon(string file, int number, bool largeIcon)
-	{
-		IntPtr large, small;
-		ExtractIconEx(file, number, out large, out small, 1);
-		try {
-			return Icon.FromHandle(largeIcon ? large : small);
-		} catch {
-			return null;
+$Signature = @{
+	Namespace            = "WinAPI"
+	Name                 = "Utils"
+	Language             = "CSharp"
+	UsingNamespace       = "System.Runtime", "System.IO", "System.Text", "System.Drawing", "System.Globalization"
+	ReferencedAssemblies = $Drawing_Assembly
+	ErrorAction          = "Stop"
+	WarningAction        = "Ignore"
+	MemberDefinition     = @"
+		[DllImport("shell32.dll", CharSet = CharSet.Auto, SetLastError = true, BestFitMapping = false, ThrowOnUnmappableChar = true)]
+		internal static extern int ExtractIconEx(string sFile, int iIndex, out IntPtr piLargeVersion, out IntPtr piSmallVersion, int amountIcons);
+
+		[DllImport("user32.dll")]
+		public static extern bool ShowWindow(IntPtr handle, int state);
+		// Extract an icon from a DLL
+		public static Icon ExtractIcon(string file, int number, bool largeIcon) {
+			IntPtr large, small;
+			ExtractIconEx(file, number, out large, out small, 1);
+			try {
+				return Icon.FromHandle(largeIcon ? large : small);
+			} catch {
+				return null;
+			}
 		}
-	}
 "@
+}
 
 if (!$Cmd) {
 	Write-Host Please Wait...
-	if ($host.version -ge "7.0") {
-		Add-Type -WarningAction Ignore -IgnoreWarnings -MemberDefinition $code -Namespace Gui -UsingNamespace System.Runtime, System.IO, System.Text, System.Drawing, System.Globalization -ReferencedAssemblies System.Drawing.Common -Name Utils -ErrorAction Stop
-	} else {
-		Add-Type -MemberDefinition $code -Namespace Gui -UsingNamespace System.IO, System.Text, System.Drawing, System.Globalization -ReferencedAssemblies System.Drawing -Name Utils -ErrorAction Stop
+
+	if (!("WinAPI.Utils" -as [type]))
+	{
+		Add-Type @Signature
 	}
 	Add-Type -AssemblyName PresentationFramework
+
 	# Hide the powershell window: https://stackoverflow.com/a/27992426/1069307
-	[Gui.Utils]::ShowWindow(([System.Diagnostics.Process]::GetCurrentProcess() | Get-Process).MainWindowHandle, 0) | Out-Null
+	[WinAPI.Utils]::ShowWindow(([System.Diagnostics.Process]::GetCurrentProcess() | Get-Process).MainWindowHandle, 0) | Out-Null
 }
 #endregion
 
@@ -98,9 +137,9 @@ $WindowsVersions = @(
 	@(
 		@("Windows 11", "windows11"),
 		@(
-			"22H2 (Build 22621.521 - 2022.09)",
-			@("Windows 11 Home/Pro/Edu", 2360),
-			@("Windows 11 Home China ", ($zh + 2361))
+			"22H2 v1 (Build 22621.525 - 2022.10)",
+			@("Windows 11 Home/Pro/Edu", 2370),
+			@("Windows 11 Home China ", ($zh + 2371))
 		),
 		@(
 			"21H2 v1 (Build 22000.318 - 2021.11)",
@@ -115,6 +154,11 @@ $WindowsVersions = @(
 	),
 	@(
 		@("Windows 10", "Windows10ISO"),
+		@(
+			"22H2 (Build 19045.2006 - 2022.10)",
+			@("Windows 10 Home/Pro/Edu", 2377),
+			@("Windows 10 Home China ", ($zh + 2378))
+		),
 		@(
 			"21H2 (Build 19044.1288 - 2021.11)",
 			@("Windows 10 Home/Pro/Edu", 2084),
@@ -267,17 +311,13 @@ $WindowsVersions = @(
 			@("Windows 8.1 KN", ($ko + 62))
 		)
 	),
-	@(
-		@("Windows 7", "WIN7"),
-		@(
-			"with SP1 (build 7601)",
-			@("Windows 7 Ultimate", 0),
-			@("Windows 7 Professional", 1),
-			@("Windows 7 Home Premium", 2)
-		)
-	),
 	@(
 		@("UEFI Shell 2.2", "UEFI_SHELL 2.2"),
+		@(
+			"22H2 (edk2-stable202211)",
+			@("Release", 0),
+			@("Debug", 1)
+		),
 		@(
 			"22H1 (edk2-stable202205)",
 			@("Release", 0),
@@ -300,49 +340,13 @@ $WindowsVersions = @(
 		)
 	),
 	@(
-		@("UEFI Shell 2.0", "UEFI_SHELL 2.0"),	
+		@("UEFI Shell 2.0", "UEFI_SHELL 2.0"),
 		@(
 			"4.632 [20100426]",
 			@("Release", 0)
 		)
 	)
 )
-
-$Windows7Versions = @(
-	# 0: Windows 7 Ultimate
-	@(
-		# Need a dummy to prevent PS from coalescing single array entries
-		@(""),
-		@("English (US)", "en-us",
-			@(
-				@("x64", "https://download.microsoft.com/download/5/1/9/5195A765-3A41-4A72-87D8-200D897CBE21/7601.24214.180801-1700.win7sp1_ldr_escrow_CLIENT_ULTIMATE_x64FRE_en-us.iso"),
-				@("x86", "https://download.microsoft.com/download/1/E/6/1E6B4803-DD2A-49DF-8468-69C0E6E36218/7601.24214.180801-1700.win7sp1_ldr_escrow_CLIENT_ULTIMATE_x86FRE_en-us.iso")
-			)
-		)
-	),
-	# 1: Windows 7 Profesional
-	@(
-		@(""),
-		@("English (US)", "en-us",
-			@(
-				@("x64", "https://download.microsoft.com/download/0/6/3/06365375-C346-4D65-87C7-EE41F55F736B/7601.24214.180801-1700.win7sp1_ldr_escrow_CLIENT_PROFESSIONAL_x64FRE_en-us.iso"),
-				@("x86", "https://download.microsoft.com/download/C/0/6/C067D0CD-3785-4727-898E-60DC3120BB14/7601.24214.180801-1700.win7sp1_ldr_escrow_CLIENT_PROFESSIONAL_x86FRE_en-us.iso")
-			)
-		)
-	),
-	# 2: Windows 7 Home Premium
-	@(
-		@(""),
-		@("English (US)", "en-us",
-			@(
-				@("x64", "https://download.microsoft.com/download/E/A/8/EA804D86-C3DF-4719-9966-6A66C9306598/7601.24214.180801-1700.win7sp1_ldr_escrow_CLIENT_HOMEPREMIUM_x64FRE_en-us.iso"),
-				@("x86", "https://download.microsoft.com/download/E/D/A/EDA6B508-7663-4E30-86F9-949932F443D0/7601.24214.180801-1700.win7sp1_ldr_escrow_CLIENT_HOMEPREMIUM_x86FRE_en-us.iso")
-			)
-		)
-	)
-
-
-)
 #endregion
 
 #region Functions
@@ -392,9 +396,9 @@ function Select-Language([string]$LangName)
 		($SysLocale.StartsWith("tr") -and $LangName -like "*Turk*") -or `
 		($SysLocale.StartsWith("uk") -and $LangName -like "*Ukrain*") -or `
 		($SysLocale.StartsWith("vi") -and $LangName -like "*Vietnam*")) {
-		return $True
+		return $true
 	}
-	return $False
+	return $false
 }
 
 function Add-Entry([int]$pos, [string]$Name, [array]$Items, [string]$DisplayName)
@@ -486,8 +490,8 @@ function ConvertTo-ImageSource
 
 function Throw-Error([object]$Req, [string]$Alt)
 {
-	$Err = $(GetElementById -Request $r -Id "errorModalMessage").innerText
-	if (-not $Err) {
+	$Err = $(GetElementById -Request $Req -Id "errorModalMessage").innerText -replace "<[^>]+>" -replace "\s+", " "
+	if (!$Err) {
 		$Err = $Alt
 	} else {
 		$Err = [System.Text.Encoding]::UTF8.GetString([byte[]][char[]]$Err)
@@ -498,7 +502,7 @@ function Throw-Error([object]$Req, [string]$Alt)
 # Translate a message string
 function Get-Translation([string]$Text)
 {
-	if (-not $English -contains $Text) {
+	if (!($English -contains $Text)) {
 		Write-Host "Error: '$Text' is not a translatable string"
 		return "(Untranslated)"
 	}
@@ -536,7 +540,7 @@ function Error([string]$ErrorMessage)
 	if (!$Cmd) {
 		$XMLForm.Title = $(Get-Translation("Error")) + ": " + $ErrorMessage
 		Refresh-Control($XMLForm)
-		$XMLGrid.Children[2 * $script:Stage + 1].IsEnabled = $True
+		$XMLGrid.Children[2 * $script:Stage + 1].IsEnabled = $true
 		$UserInput = [System.Windows.MessageBox]::Show($XMLForm.Title,  $(Get-Translation("Error")), "OK", "Error")
 		$script:ExitCode = $script:Stage--
 	} else {
@@ -582,14 +586,14 @@ if ($Cmd) {
 $MaxStage = 4
 $SessionId = [guid]::NewGuid()
 $ExitCode = 100
-$Locale = "en-US"
+$Locale = $Locale
 $RequestData = @{}
 # This GUID applies to all visitors, regardless of their locale
 $RequestData["GetLangs"] = @("a8f8f489-4c7f-463a-9ca6-5cff94d8d041", "getskuinformationbyproductedition" )
 # This GUID applies to visitors of the en-US download page. Other locales may get a different GUID.
 $RequestData["GetLinks"] = @("6e2a1789-ef16-4f27-a296-74ef7ef5d96b", "GetProductDownloadLinksBySku" )
 # Create a semi-random Linux User-Agent string
-$FirefoxVersion = Get-Random -Minimum 50 -Maximum 90
+$FirefoxVersion = Get-Random -Minimum 90 -Maximum 110
 $FirefoxDate = Get-RandomDate
 $UserAgent = "Mozilla/5.0 (X11; Linux i586; rv:$FirefoxVersion.0) Gecko/$FirefoxDate Firefox/$FirefoxVersion.0"
 $Verbosity = 2
@@ -604,30 +608,25 @@ if ($Cmd) {
 
 # Localization
 $EnglishMessages = "en-US|Version|Release|Edition|Language|Architecture|Download|Continue|Back|Close|Cancel|Error|Please wait...|" +
-	"Download using a browser|Temporarily banned by Microsoft for requesting too many downloads - Please try again later...|" +
-	"PowerShell 3.0 or later is required to run this script.|Do you want to go online and download it?"
+	"Download using a browser|Download of Windows ISOs is unavailable due to Microsoft having altered their website to prevent it.|" +
+	"PowerShell 3.0 or later is required to run this script.|Do you want to go online and download it?|" +
+	"This feature is not available on this platform."
 [string[]]$English = $EnglishMessages.Split('|')
 [string[]]$Localized = $null
-if ($LocData -and (-not $LocData.StartsWith("en-US"))) {
+if ($LocData -and !$LocData.StartsWith("en-US")) {
 	$Localized = $LocData.Split('|')
-	if ($Localized.Length -ne $English.Length) {
-		Write-Host "Error: Missing or extra translated messages provided ($($Localized.Length)/$($English.Length))"
-		exit 101
+	# Adjust the $Localized array if we have more or fewer strings than in $EnglishMessages
+	if ($Localized.Length -lt $English.Length) {
+		while ($Localized.Length -ne $English.Length) {
+			$Localized += $English[$Localized.Length]
+		}
+	} elseif ($Localized.Length -gt $English.Length) {
+		$Localized = $LocData.Split('|')[0..($English.Length - 1)]
 	}
 	$Locale = $Localized[0]
 }
 $QueryLocale = $Locale
 
-# Make sure PowerShell 3.0 or later is used (for Invoke-WebRequest)
-if ($PSVersionTable.PSVersion.Major -lt 3) {
-	Write-Host Error: PowerShell 3.0 or later is required to run this script.
-	$Msg = "$(Get-Translation($English[15]))`n$(Get-Translation($English[16]))"
-	if ([System.Windows.MessageBox]::Show($Msg, $(Get-Translation("Error")), "YesNo", "Error") -eq "Yes") {
-		Start-Process -FilePath https://www.microsoft.com/download/details.aspx?id=34595
-	}
-	exit 102
-}
-
 # Convert a size in bytes to a human readable string
 function Size-To-Human-Readable([uint64]$size)
 {
@@ -641,7 +640,8 @@ function Size-To-Human-Readable([uint64]$size)
 }
 
 # Check if the locale we want is available - Fall back to en-US otherwise
-function Check-Locale {
+function Check-Locale
+{
 	try {
 		$url = "https://www.microsoft.com/" + $QueryLocale + "/software-download/"
 		if ($Verbosity -ge 2) {
@@ -697,6 +697,17 @@ function Get-Windows-Languages([int]$SelectedVersion, [int]$SelectedEdition)
 	} elseif ($WindowsVersions[$SelectedVersion][0][1].StartsWith("UEFI_SHELL")) {
 		$languages += @(New-Object PsObject -Property @{ DisplayLanguage = "English (US)"; Language = "en-us"; Id = 0 })
 	} else {
+		# Microsoft download protection now requires the sessionId to be whitelisted through vlscppe.microsoft.com/tags
+		$url = "https://vlscppe.microsoft.com/tags?org_id=y6jn8c31&session_id=" + $SessionId
+		if ($Verbosity -ge 2) {
+			Write-Host Querying $url
+		}
+		try {
+			Invoke-WebRequest -UseBasicParsing -MaximumRedirection 0 -UserAgent $UserAgent $url | Out-Null
+		} catch {
+			Error($_.Exception.Message)
+			return @()
+		}
 		$url = "https://www.microsoft.com/" + $QueryLocale + "/api/controls/contentinclude/html"
 		$url += "?pageId=" + $RequestData["GetLangs"][0]
 		$url += "&host=www.microsoft.com"
@@ -711,11 +722,12 @@ function Get-Windows-Languages([int]$SelectedVersion, [int]$SelectedEdition)
 
 		$script:SelectedIndex = 0
 		try {
-			$r = Invoke-WebRequest -UseBasicParsing -UserAgent $UserAgent -SessionVariable "Session" $url
+			$r = Invoke-WebRequest -Method Post -UseBasicParsing -UserAgent $UserAgent -SessionVariable "Session" $url
 			if ($r -match "errorModalMessage") {
 				Throw-Error -Req $r -Alt "Could not retrieve languages from server"
 			}
-			$pattern = '(?s)<select id="product-languages">(.*)?</select>'
+			$r = $r -replace "`n" -replace "`r"
+			$pattern = '.*<select id="product-languages"[^>]*>(.*)</select>.*'
 			$html = [regex]::Match($r, $pattern).Groups[1].Value
 			# Go through an XML conversion to keep all PowerShells happy...
 			$html = $html.Replace("selected value", "value")
@@ -766,7 +778,7 @@ function Get-Windows-Download-Links([int]$SelectedVersion, [int]$SelectedRelease
 			$xml = New-Object System.Xml.XmlDocument
 			if ($Verbosity -ge 2) {
 				Write-Host Querying $url
-			}			
+			}
 			$xml.Load($url)
 			$sep = ""
 			$archs = ""
@@ -798,11 +810,18 @@ function Get-Windows-Download-Links([int]$SelectedVersion, [int]$SelectedRelease
 
 		try {
 			$Is64 = [Environment]::Is64BitOperatingSystem
-			# Must add a referer for POST requests, else Microsoft's servers will deny them
+			# Must add a referer for this request, else Microsoft's servers will deny it
 			$ref = "https://www.microsoft.com/software-download/windows11"
-			$r = Invoke-WebRequest -Method Post -Headers @{"Referer" = $ref} -UseBasicParsing -UserAgent $UserAgent -WebSession $Session $url
+			$r = Invoke-WebRequest -Method Post -Headers @{ "Referer" = $ref } -UseBasicParsing -UserAgent $UserAgent -WebSession $Session $url
 			if ($r -match "errorModalMessage") {
-				Throw-Error -Req $r -Alt "Could not retrieve architectures from server"
+				$Alt = [regex]::Match($r.Content, '<p id="errorModalMessage">(.+?)<\/p>').Groups[1].Value -replace "<[^>]+>" -replace "\s+", " " -replace "\?\?\?", "-"
+				$Alt = [System.Text.Encoding]::UTF8.GetString([byte[]][char[]]$Alt)
+				if (!$Alt) {
+					$Alt = "Could not retrieve architectures from server"
+				} elseif ($Alt -match "715-123130") {
+					$Alt += " " + $SessionId + "."
+				}
+				Throw-Error -Req $r -Alt $Alt
 			}
 			$pattern = '(?s)(<input.*?></input>)'
 			ForEach-Object { [regex]::Matches($r, $pattern) } | ForEach-Object { $html += $_.Groups[1].value }
@@ -817,7 +836,7 @@ function Get-Windows-Download-Links([int]$SelectedVersion, [int]$SelectedRelease
 			foreach ($var in $xml.inputs.input) {
 				$json = $var.value | ConvertFrom-Json;
 				if ($json) {
-					if (($Is64 -and $json.DownloadType -eq "x64") -or (-not $Is64 -and $json.DownloadType -eq "x86")) {
+					if (($Is64 -and $json.DownloadType -eq "x64") -or (!$Is64 -and $json.DownloadType -eq "x86")) {
 						$script:SelectedIndex = $i
 					}
 					$links += @(New-Object PsObject -Property @{ Type = $json.DownloadType; Link = $json.Uri })
@@ -839,7 +858,7 @@ function Get-Windows-Download-Links([int]$SelectedVersion, [int]$SelectedRelease
 function Process-Download-Link([string]$Url)
 {
 	try {
-		if ($PipeName -and -not $Check.IsChecked) {
+		if ($PipeName -and !$Check.IsChecked) {
 			Send-Message -PipeName $PipeName -Message $Url
 		} else {
 			if ($Cmd) {
@@ -850,7 +869,7 @@ function Process-Download-Link([string]$Url)
 				$tmp_size = [uint64]::Parse($str_size)
 				$Size = Size-To-Human-Readable $tmp_size
 				Write-Host "Downloading '$File' ($Size)..."
-				Invoke-WebRequest -UseBasicParsing -Uri $Url -OutFile $File
+				Start-BitsTransfer -Source $Url -Destination $File
 			} else {
 				Write-Host Download Link: $Url
 				Start-Process -FilePath $Url
@@ -871,6 +890,12 @@ if ($Cmd) {
 	$winLanguageName = $null
 	$winLink = $null
 
+	# Windows 7 and non Windows platforms are too much of a liability
+	if ($winver -le 6.1) {
+		Error(Get-Translation("This feature is not available on this platform."))
+		exit 403
+	}
+
 	$i = 0
 	$Selected = ""
 	if ($Win -eq "List") {
@@ -931,7 +956,7 @@ if ($Cmd) {
 			if (!$Ed -and $Verbosity -ge 1) {
 				Write-Host "No edition specified (-Ed). Defaulting to '$($edition.Edition)'."
 			}
-			$Selected += "," + $edition.Edition -replace "Windows [0-9\.]*", ""
+			$Selected += "," + $edition.Edition -replace "Windows [0-9\.]*"
 			$winEditionId = $edition.Id
 			break;
 		}
@@ -951,6 +976,10 @@ if ($Cmd) {
 	}
 	if ($Lang -eq "List") {
 		Write-Host "Please select a Language (-Lang) for ${Selected}:"
+	} elseif ($Lang) {
+		# Escape parentheses so that they aren't interpreted as regex
+		$Lang = $Lang.replace('(', '\(')
+		$Lang = $Lang.replace(')', '\)')
 	}
 	$i = 0
 	foreach ($language in $languages) {
@@ -967,7 +996,7 @@ if ($Cmd) {
 		}
 		$i++
 	}
-	if ($winLanguageId -eq $null -or $winLanguageName -eq $null) {
+	if (!$winLanguageId -or !$winLanguageName) {
 		if ($Lang -ne "List") {
 			Write-Host "Invalid Windows language provided."
 			Write-Host "Use '-Lang List' for a list of available languages or remove the option to use system default."
@@ -1025,7 +1054,7 @@ $XMLForm.Title = $AppTitle
 if ($Icon) {
 	$XMLForm.Icon = $Icon
 } else {
-	$XMLForm.Icon = [Gui.Utils]::ExtractIcon("shell32.dll", -41, $true) | ConvertTo-ImageSource
+	$XMLForm.Icon = [WinAPI.Utils]::ExtractIcon("imageres.dll", -5205, $true) | ConvertTo-ImageSource
 }
 if ($Locale.StartsWith("ar") -or $Locale.StartsWith("fa") -or $Locale.StartsWith("he")) {
 	$XMLForm.FlowDirection = "RightToLeft"
@@ -1034,6 +1063,12 @@ $WindowsVersionTitle.Text = Get-Translation("Version")
 $Continue.Content = Get-Translation("Continue")
 $Back.Content = Get-Translation("Close")
 
+# Windows 7 and non Windows platforms are too much of a liability
+if ($winver -le 6.1) {
+	Error(Get-Translation("This feature is not available on this platform."))
+	exit 403
+}
+
 # Populate the Windows versions
 $i = 0
 $versions = @()
@@ -1047,9 +1082,9 @@ $WindowsVersion.DisplayMemberPath = "Version"
 # Button Action
 $Continue.add_click({
 	$script:Stage++
-	$XMLGrid.Children[2 * $Stage + 1].IsEnabled = $False
-	$Continue.IsEnabled = $False
-	$Back.IsEnabled = $False
+	$XMLGrid.Children[2 * $Stage + 1].IsEnabled = $false
+	$Continue.IsEnabled = $false
+	$Back.IsEnabled = $false
 	Refresh-Control($Continue)
 	Refresh-Control($Back)
 
@@ -1058,7 +1093,7 @@ $Continue.add_click({
 		1 { # Windows Version selection
 			$XMLForm.Title = Get-Translation($English[12])
 			Refresh-Control($XMLForm)
-			if ($WindowsVersion.SelectedValue.Version.StartsWith("Windows") -and $WindowsVersion.SelectedValue.Version -ne "Windows 7") {
+			if ($WindowsVersion.SelectedValue.Version.StartsWith("Windows")) {
 				Check-Locale
 			}
 			$releases = Get-Windows-Releases $WindowsVersion.SelectedValue.Index
@@ -1117,9 +1152,9 @@ $Continue.add_click({
 			$XMLForm.Close()
 		}
 	}
-	$Continue.IsEnabled = $True
+	$Continue.IsEnabled = $true
 	if ($Stage -ge 0) {
-		$Back.IsEnabled = $True
+		$Back.IsEnabled = $true
 	}
 })
 
@@ -1129,7 +1164,7 @@ $Back.add_click({
 	} else {
 		$XMLGrid.Children.RemoveAt(2 * $Stage + 3)
 		$XMLGrid.Children.RemoveAt(2 * $Stage + 2)
-		$XMLGrid.Children[2 * $Stage + 1].IsEnabled = $True
+		$XMLGrid.Children[2 * $Stage + 1].IsEnabled = $true
 		$dh2 = $dh
 		if ($Stage -eq 4 -and $PipeName) {
 			$Check.Visibility = "Collapsed"
@@ -1154,7 +1189,7 @@ $Back.add_click({
 })
 
 # Display the dialog
-$XMLForm.Add_Loaded( { $XMLForm.Activate() } )
+$XMLForm.Add_Loaded({$XMLForm.Activate()})
 $XMLForm.ShowDialog() | Out-Null
 
 # Clean up & exit
@@ -1163,8 +1198,8 @@ exit $ExitCode
 # SIG # Begin signature block
 # MIIkWQYJKoZIhvcNAQcCoIIkSjCCJEYCAQExDzANBglghkgBZQMEAgEFADB5Bgor
 # BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
-# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCD6h5jkGuLA4flo
-# AEOvdhqzbH5KP4Nh/95HnUq3WD2RxKCCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU
+# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCAXwtxm+mYAZToF
+# MN/W9BVxYssBdJgHpUBa5KaOnXxekaCCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU
 # jTanyYqJ1pQWMA0GCSqGSIb3DQEBDAUAMHsxCzAJBgNVBAYTAkdCMRswGQYDVQQI
 # DBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoM
 # EUNvbW9kbyBDQSBMaW1pdGVkMSEwHwYDVQQDDBhBQUEgQ2VydGlmaWNhdGUgU2Vy
@@ -1267,23 +1302,23 @@ exit $ExitCode
 # aWMgQ29kZSBTaWduaW5nIENBIEVWIFIzNgIRAL+xUAG79ZLUlip3l+pzb6MwDQYJ
 # YIZIAWUDBAIBBQCgfDAQBgorBgEEAYI3AgEMMQIwADAZBgkqhkiG9w0BCQMxDAYK
 # KwYBBAGCNwIBBDAcBgorBgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG
-# 9w0BCQQxIgQgYNJ1tAjux5cSXZGUyaCHzKMqd3wSI6IPP6QRgfqH7ZcwDQYJKoZI
-# hvcNAQEBBQAEggIAC77UeQjlf3wPGfBs449r/Fd86SGJTkIhncW5qierUDv7jCzG
-# 41Z+GHaDoDqyuha2ciiMy41YyEOXsxAQ3jvN0AUk3lhFrw1vpxRgljp3Gqix92QW
-# gwweiJIf7Wk25F0AIQRxTrYcUeHQTglaAJ9pWsnRDkrBNMmEWF13dYzwLEh27WYn
-# R+tGNGysWWincXwjiB4siSvYc8UOkWci/scK1xP8OYPrHSkA4dkgPtdE5C4h0hU2
-# 7stnpOtb0ghRLSoEBSASfTD1827GAV2/tWZ0imnluEtK6AW8mNDO6Y8Y1hqfsYl6
-# DapPzvFAE/AqvMEnLRF2GnYAChTsFj2dhlNk7bRGqdTU5Y68VYjolNTEcuXJ7cAD
-# RVXUvA/kcaF03cm14h0uBC1H5r4uKV5qp0QX3442yze8xwLsoEJncS+lzgOzMpsf
-# sFND0eShfTDbS9o5xZqunafY1NZOzu3zd6zh+YssOA8JCkPxdFGDzCSv0FUjM9bE
-# +ieZptkB5ENhva07fajhKdY/HVUOxEGUFUuWz0oiPGtCtcsTLT/LIda/xxmM4iFe
-# w8eqmuDJFNGtRWhJrd5JjU5CVhMUHvlrC/sA+QqkFvE7uQ1AkwmXocY8vbGR4H2V
-# wnlccMmGuBkYniuhYFdikRwS/hXT/YOr3tsb1Upnkze/udz8rGsHOMUKt9ehgg49
+# 9w0BCQQxIgQgkLJ7KpFnRXWMO8X7vU/I7Q3jtnRJIa2M3A+9pgWOFiowDQYJKoZI
+# hvcNAQEBBQAEggIAQGV7TPwZw904Z5j2/ahvb7kpVdcm89xya4cTxreS6h0S11+T
+# DHXNDzKE9RkE8i3WaHcJyUKOAGXSeD27Vn4xcAvHOSGv2OxaST3/BN+rpxccngPd
+# PhGOY8YIp9AWtCupGOanWxgUlr9ixSFgYZmd3pxNz8fgNi9sTU0uRwIlXd0Mjj3m
+# a7svCTZhs2gKYDwSwVuHDG3EV4oOEKF2SvdIcACWO4uedi0M7VebGdgQ+H8+b26Z
+# y6C8WPG3BUk/qlkqjusfB11WfKMlYrlnYhGfdnM1VrBQKQEODaNHszYoOtL92Pen
+# 8mGqRZUMQCU+Hwb9ArtHckaHDAYXTgwNzqlqQOZlhfxiuwEssGjVE45oQabv8fRq
+# rQfwI4oYM9Y1WEjlTBvTi3GQgb/NuvWKOh8YnbFWWq+QFRG73Egn/uicrPxIgDoy
+# wt8PE09PGhJQ+qVyhqrUeeSF+j0evA6E2pUmP49ZLBsKthhYEI1h5JPMBgxkuXC4
+# 5ZfkVCALwOZ/LD4vRMZBghXQbAI5WvjB+iObSEO9MtoI/MPMDKyOfEueYDb2nroL
+# d3R98omGWCLoCCr+BLg+XjZQWliSUs8L/sNAUlBb1S0kWwpSND+NUHed4VEnS14H
+# Rtn3Cx2H7WgHeQSfiOPDcYtTqHz48RHuhd2C+v+NiPKgkOtTxLH7H6BlW96hgg49
 # MIIOOQYKKwYBBAGCNwMDATGCDikwgg4lBgkqhkiG9w0BBwKggg4WMIIOEgIBAzEN
 # MAsGCWCGSAFlAwQCATCCAQ8GCyqGSIb3DQEJEAEEoIH/BIH8MIH5AgEBBgtghkgB
-# hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCA14LAXm88+tZ3FC2cVxGuBtbMKzk6a
-# NCjj3OgaseaZvgIVAIhD9ElHH5Y3yqMokr9xGzeLKkwSGA8yMDIyMDkyMDIxNTcw
-# OFowAwIBHqCBhqSBgzCBgDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVj
+# hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCAafKvrRkdVxwCF6brdFdzfTfKcBENE
+# HXM7VdQTxnUxUwIVANS/ey8tLSQ9LlI0IgAcicapMC63GA8yMDIzMDUxNTEwNDE1
+# NFowAwIBHqCBhqSBgzCBgDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVj
 # IENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMTEw
 # LwYDVQQDEyhTeW1hbnRlYyBTSEEyNTYgVGltZVN0YW1waW5nIFNpZ25lciAtIEcz
 # oIIKizCCBTgwggQgoAMCAQICEHsFsdRJaFFE98mJ0pwZnRIwDQYJKoZIhvcNAQEL
@@ -1346,13 +1381,13 @@ exit $ExitCode
 # BgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRlYyBU
 # cnVzdCBOZXR3b3JrMSgwJgYDVQQDEx9TeW1hbnRlYyBTSEEyNTYgVGltZVN0YW1w
 # aW5nIENBAhB71OWvuswHP6EBIwQiQU0SMAsGCWCGSAFlAwQCAaCBpDAaBgkqhkiG
-# 9w0BCQMxDQYLKoZIhvcNAQkQAQQwHAYJKoZIhvcNAQkFMQ8XDTIyMDkyMDIxNTcw
-# OFowLwYJKoZIhvcNAQkEMSIEICcu8Fuw/1HxTul0vtNyaZO+8LZLFsCph/n2wPti
-# mtGwMDcGCyqGSIb3DQEJEAIvMSgwJjAkMCIEIMR0znYAfQI5Tg2l5N58FMaA+eKC
-# ATz+9lPvXbcf32H4MAsGCSqGSIb3DQEBAQSCAQB5LyfB7M+z9j4uVqZ76ibc5DuL
-# SGPIqu9Uakos5Mbg7IMAYt1MrnCzqQw00eqa87HCfa48UJz4npEjeo9wo+iHFf+S
-# fLXDzzJ1UK6d8o0ESEQI6/HKi/CQ052Ikt2q0gbhsvp3tb2OlLDu5hWz0+yIf+ru
-# rP/lGpjwRImXpTdlQEfZ9nxOj+pEowaV7KyS/ukMOWygQn8pS42McNW2JV1WXAPT
-# MJ+bLdHy7W9jQIK8xZ6yqS7H9YYKRvCNz28zYBWrRl+Lgr5vsM+WJ6+1042pnd4G
-# 5NiyWHvp4kd5EiuKAIyc+8kb4yGATNf08utpKxNQ/0e58ibNaChRS3UyI/fO
+# 9w0BCQMxDQYLKoZIhvcNAQkQAQQwHAYJKoZIhvcNAQkFMQ8XDTIzMDUxNTEwNDE1
+# NFowLwYJKoZIhvcNAQkEMSIEIL8/K60mXh1FyzaYk4hwVgMOGPKp8M9K7pisnqDz
+# cLTtMDcGCyqGSIb3DQEJEAIvMSgwJjAkMCIEIMR0znYAfQI5Tg2l5N58FMaA+eKC
+# ATz+9lPvXbcf32H4MAsGCSqGSIb3DQEBAQSCAQBJj/OBxctaK11U1/Cv0rxP4fgV
+# 9KKW7nWieer5TbP7QJXiJx88gBo4sF5yg+DfkvALpDWujtDdGSq6d0DweNnRADB7
+# x8uHhGybC0+sQwbWe8haUL9qSaqEVOQ2LQxQ2TFXtXJEx+hIHvwbtL64dy1nD57W
+# BdhVf3Sgud0YgpA7B7x4bARWFiz9KQY9AhUq/cZN9OWYTq59T2f4l3zDBAf7d3ni
+# JAF5Omx4OEsWzfbvEwe3WxtWenFk4QhlaDlj4xVQzJQgYDOeebd74uFjRpY+ohnJ
+# 0RSC2IMQzxz1bvdGx1tO8NpFgJy6E7JoWEqiZA+PgpqWoUy7EaErjArL7Htt
 # SIG # End signature block

Fido.pssproj

@@ -1,35 +0,0 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>6CAFC0C6-A428-4d30-A9F9-700E829FEA51</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>Fido</RootNamespace>
-    <AssemblyName>Fido</AssemblyName>
-    <Name>Frida</Name>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <Compile Include="Fido.ps1" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Target Name="Build" />
-  <Import Project="$(MSBuildExtensionsPath)\PowerShell Tools for Visual Studio\PowerShellTools.targets" Condition="Exists('$(MSBuildExtensionsPath)\PowerShell Tools for Visual Studio\PowerShellTools.targets')" />
-</Project>

Fido.sln

@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.271
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F5034706-568F-408A-B7B3-4D38C6DB8A32}") = "Fido", "Fido.pssproj", "{6CAFC0C6-A428-4D30-A9F9-700E829FEA51}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6CAFC0C6-A428-4D30-A9F9-700E829FEA51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6CAFC0C6-A428-4D30-A9F9-700E829FEA51}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6CAFC0C6-A428-4D30-A9F9-700E829FEA51}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6CAFC0C6-A428-4D30-A9F9-700E829FEA51}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {AD54CEAE-0992-4213-BEDB-8F1CF98A9F22}
-	EndGlobalSection
-EndGlobal

README.md

@@ -1,5 +1,5 @@
-Fido: A PowerShell download script for Windows ISOs and UEFI Shell
-==================================================================
+Fido: A PowerShell download script for Microsoft Windows and UEFI Shell ISOs
+============================================================================
 
 [![Licence](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat-square)](https://www.gnu.org/licenses/gpl-3.0.en.html)
 [![Github stats](https://img.shields.io/github/downloads/pbatard/Fido/total.svg?style=flat-square)](https://github.com/pbatard/Fido/releases)
@@ -9,12 +9,12 @@ Description
 
 Fido is a PowerShell script that is primarily designed to be used in [Rufus](https://github.com/pbatard/rufus), but that
 can also be used in standalone fashion, and whose purpose is to automate access to the official Microsoft Windows retail
-ISO download links as well as provide convenient access to bootable UEFI Shell images.
+ISO download links as well as provide convenient access to [bootable UEFI Shell images](https://github.com/pbatard/UEFI-Shell).
 
 This script exists because, while Microsoft does make retail ISO download links freely and publicly available (at least
-for Windows 8 and Windows 10), it only does so after actively forcing users to jump through a lot of unwarranted hoops,
-that create an exceedingly counterproductive, if not downright unfriendly, consumer experience and that greatly detract
-from what people really want (direct access to ISO downloads).
+for Windows 8 through Windows 11), up until recent releases, most of these links were only available after forcing users
+to jump through a lot of unwarranted hoops that created an exceedingly counterproductive, if not downright unfriendly,
+consumer experience, that greatly detracted from what people really want (direct access to ISO downloads).
 
 As to the reason one might want to download Windows __retail__ ISOs, as opposed to the ISOs that are generated by
 Microsoft's own Media Creation Tool (MCT), this is because using official retail ISOs is currently the only way to
@@ -42,26 +42,21 @@ License
 How it works
 ------------
 
-The script basically performs the same operation as one might perform when visiting either of the following URLs (that
-is, provided that you have also changed your `User-Agent` browser string, since, when they detect that you are using a
-version of Windows that is the same as the one you are trying to download, the Microsoft web servers at these addresses
-redirect you __away__ from the pages that allow you to download retail ISOs):
+The script basically performs the same operation as one might perform when visiting the following URL (that is, in the
+case of Windows 10, provided that you have also changed your `User-Agent` browser string, since, the Microsoft web
+servers detect that you are using a version of Windows that is the same as the one you are trying to download, they
+may redirect you __away__ from the page that allows you to obtain a direct ISO download link):
 
 https://www.microsoft.com/en-us/software-download
 
-After checking access to these URLs, to confirm that they are accessible, the script first queries the web API from the
+After checking basic access to the Microsoft software downloads website the script first queries the web API from the
 Microsoft servers, to request the language selection available for the version of Windows selected, and then requests
-the actual download links for all the architectures available for that language + version.
+the actual download links, for all the architectures available for that language + version.
 
 Requirements
 ------------
 
-PowerShell 3.0 or later is required. However the script should detect if you are using an older version and point you to
-the relevant PowerShell 3.0 download page if needed (which should only ever occur if you are running a vanilla version
-of Windows 7).
-
-Note that the current version of the script does not need Internet Explorer to be installed and should also work with
-PowerShell 7.
+Windows 8 or later with PowerShell. Windows 7 is __not__ supported.
 
 Commandline mode
 ----------------
@@ -71,17 +66,17 @@ and you can instead generate the ISO download from within a PowerShell console o
 
 The options are:
 - `Win`: Specify Windows version (e.g. _"Windows 10"_). Abbreviated version should work as well (e.g `-Win 10`) as long
-   as it is unique enough. If this option isn't specified, the most recent version of Windows is automatically selected.  
+   as it is unique enough. If this option isn't specified, the most recent version of Windows is automatically selected.
    You can obtain a list of supported versions by specifying `-Win List`.
 - `Rel`: Specify Windows release (e.g. _"21H1"_). If this option isn't specified, the most recent release for the chosen
    version of Windows is automatically selected. You can also use `-Rel Latest` to force the most recent to be used.
    You can obtain a list of supported versions by specifying `-Rel List`.
 - `Ed`: Specify Windows edition (e.g. _"Pro/Home"_). Abbreviated editions should work as well (e.g `-Ed Pro`) as long
-   as it is unique enough. If this option isn't specified, the most recent version of Windows is automatically selected.  
+   as it is unique enough. If this option isn't specified, the most recent version of Windows is automatically selected.
    You can obtain a list of supported versions by specifying `-Ed List`.
 - `Lang`: Specify Windows language (e.g. _"Arabic"_). Abbreviated or part of a language (e.g. `-Lang Int` for
    `English International`) should work as long as it's unique enough. If this option isn't specified, the script attempts
-   to select the same language as the system locale.  
+   to select the same language as the system locale.
    You can obtain a list of supported languages by specifying `-Lang List`.
 - `Arch`: Specify Windows architecture (e.g. _"x64"_). If this option isn't specified, the script attempts to use the same
    architecture as the one from the current system.
@@ -126,7 +121,7 @@ Additional Notes
 
 Because of its intended usage with Rufus, this script is not designed to cover every possible retail ISO downloads.
 Instead we mostly chose the ones that the general public is likely to request. For instance, we currently have no plan
-to add support for LTSB/LTSC Windows 10 ISOs downloads.
+to add support for LTSB/LTSC Windows ISOs downloads.
 
 If you are interested in such downloads, then you are kindly invited to visit the relevant download pages from Microsoft
 such as [this one](https://www.microsoft.com/evalcenter/evaluate-windows-10-enterprise) for LTSC versions.

sign.sh

@@ -21,7 +21,7 @@ sign_file() {
 }
 
 # Update the Authenticode signature
-cmd.exe /c '"C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64\signtool" sign /v /sha1 3dbc3a2a0e9ce8803b422cfdbc60acd33164965d /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 Fido.ps1'
+MSYS2_ARG_CONV_EXCL='*' "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64\signtool" sign /v /sha1 3dbc3a2a0e9ce8803b422cfdbc60acd33164965d /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 Fido.ps1
 read -s -p "Enter pass phrase for `realpath $PRIVATE_KEY`: " PASSWORD
 echo
 # Confirm that the pass phrase is valid by trying to sign a dummy file