Fix handling of parentheses for -Lang option

* Closes #29
Fix Add-Type warnings being treated as errors on PS < 7.0
2025-09-16 14:18:02 +02:00 · 2022-09-23 17:02:36 +01:00 · 2022-09-23 16:47:44 +01:00 · 2022-09-21 16:59:01 +01:00 · 2022-09-20 22:57:29 +01:00 · 2022-08-13 15:08:20 +01:00
1 changed files with 54 additions and 33 deletions
--- a/Fido.ps1
+++ b/Fido.ps1
@@ -1,5 +1,5 @@
 #
-# Fido v1.29 - Feature ISO Downloader, for retail Windows images and UEFI Shell
+# Fido v1.34 - Feature ISO Downloader, for retail Windows images and UEFI Shell
 # Copyright © 2019-2022 Pete Batard <pete@akeo.ie>
 # Command line support: Copyright © 2021 flx5
 # ConvertTo-ImageSource: Copyright © 2016 Chris Carter
@@ -80,11 +80,12 @@ $code = @"

 if (!$Cmd) {
 	Write-Host Please Wait...
+	$Drawing_Assembly = "System.Drawing"
+	# PowerShell 7 altered the name of the Drawing assembly...
 	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
+		$Drawing_Assembly += ".Common"
 	}
+	Add-Type -ErrorAction Stop -WarningAction Ignore -IgnoreWarnings -MemberDefinition $code -Namespace Gui -UsingNamespace System.Runtime, System.IO, System.Text, System.Drawing, System.Globalization -ReferencedAssemblies $Drawing_Assembly -Name Utils
 	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
@@ -97,6 +98,11 @@ $ko = 0x20000
 $WindowsVersions = @(
 	@(
 		@("Windows 11", "windows11"),
+		@(
+			"22H2 (Build 22621.382 - 2022.09)",
+			@("Windows 11 Home/Pro/Edu", 2360),
+			@("Windows 11 Home China ", ($zh + 2361))
+		),
 		@(
 			"21H2 v1 (Build 22000.318 - 2021.11)",
 			@("Windows 11 Home/Pro/Edu", 2093),
@@ -582,7 +588,7 @@ $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"] = @("a224afab-2097-4dfa-a2ba-463eb191a285", "GetProductDownloadLinksBySku" )
+$RequestData["GetLinks"] = @("6e2a1789-ef16-4f27-a296-74ef7ef5d96b", "GetProductDownloadLinksBySku" )
 # Create a semi-random Linux User-Agent string
 $FirefoxVersion = Get-Random -Minimum 50 -Maximum 90
 $FirefoxDate = Get-RandomDate
@@ -793,7 +799,18 @@ function Get-Windows-Download-Links([int]$SelectedVersion, [int]$SelectedRelease

 		try {
 			$Is64 = [Environment]::Is64BitOperatingSystem
-			$r = Invoke-WebRequest -Method Post -UseBasicParsing -UserAgent $UserAgent -WebSession $Session $url
+			# Must add a referer for POST requests, else Microsoft's servers will deny them
+			$ref = "https://www.microsoft.com/software-download/windows11"
+			$wr = [System.Net.WebRequest]::Create($url)
+			# Windows 7 PowerShell doesn't support 'Invoke-WebRequest -Headers @{"Referer" = $ref}'
+			# (produces "The 'Referer' header must be modified using the appropriate property or method")
+			# so we use StreamReader() with GetResponseStream() and do this whole gymkhana instead...
+			$wr.Method = "POST"
+			$wr.Referer = $ref
+			$wr.UserAgent = $UserAgent
+			$wr.ContentLength = 0
+			$sr = New-Object System.IO.StreamReader($wr.GetResponse().GetResponseStream())
+			$r = $sr.ReadToEnd()
 			if ($r -match "errorModalMessage") {
 				Throw-Error -Req $r -Alt "Could not retrieve architectures from server"
 			}
@@ -944,6 +961,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) {
@@ -960,7 +981,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."
@@ -1156,8 +1177,8 @@ exit $ExitCode
 # SIG # Begin signature block
 # MIIkWQYJKoZIhvcNAQcCoIIkSjCCJEYCAQExDzANBglghkgBZQMEAgEFADB5Bgor
 # BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
-# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCCUd21zA/509mYR
-# XkEXWi6aFKT8l9bffURXZOZkYl59eKCCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU
+# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCALq9WUjK/n7osl
+# kwRBr6duVZgEzaRe3mDKv+dLomlaQaCCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU
 # jTanyYqJ1pQWMA0GCSqGSIb3DQEBDAUAMHsxCzAJBgNVBAYTAkdCMRswGQYDVQQI
 # DBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoM
 # EUNvbW9kbyBDQSBMaW1pdGVkMSEwHwYDVQQDDBhBQUEgQ2VydGlmaWNhdGUgU2Vy
@@ -1260,23 +1281,23 @@ exit $ExitCode
 # aWMgQ29kZSBTaWduaW5nIENBIEVWIFIzNgIRAL+xUAG79ZLUlip3l+pzb6MwDQYJ
 # YIZIAWUDBAIBBQCgfDAQBgorBgEEAYI3AgEMMQIwADAZBgkqhkiG9w0BCQMxDAYK
 # KwYBBAGCNwIBBDAcBgorBgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG
-# 9w0BCQQxIgQgnOLuAJgasqtP0asVaTTabVZcSAS0nUiaa794Arw5nuwwDQYJKoZI
-# hvcNAQEBBQAEggIAWrMZs466V8a6VLdx8ibYBsT21ySAy+JWKhXpvBBHjJmO884j
-# sXbO1fBsnywPZpacbL84FJOfGmTCNPfc91pLSN6ZU2OLKDAWCpV4CYachH4MQSJL
-# +huCUjuqmv5ivjEE5QmE3EZWCUht8tz2E8dKJUjWb7SKB4NKX9ocioAKWHT/4fwN
-# WD7S1Cc14WrHd0sP04ZvT2LdBDjWVxht/dMROc2pBhjSjb2rAL2Hw/aFEHEhVN7w
-# 35S2ygn7oBuBExDNfnQMO+S3JGYkhki1OCDLg/rPeGbMcDSHTbHvfXUwHTyPc2AN
-# 6kxyqHmiDhZRUH2++Bm/1VKkXD/6G92nmPrMhSscoFd9ArFukQKsLZ3EM2KBROQu
-# bm/usYHhzZp3gG1T5vvx2g4n7EEArhrfwTJqcLvw0zr+D3LZ5YVj4wVskD/olw7f
-# FILAdC4GMA49BegBqf47Fn26YyPm+ljDWvFF9LJ129sRfPL4igzZX9vtFy65G05P
-# if31ZJNQyeUKy0angQpLrI2EZkQUMdy9XveBtWZGu9hruQMdHGr7pINsf18b/O4+
-# cd4LQMhGw1h9OPYNUVWL8wC6oWcSv1h3AT1kaZ4iO4AVE7LmstdwhIsMWgC/Dp15
-# 6S9jycztOy3aV+jZ6L0nAEJDMAUOMhFEgTq0Nh/njG4hBdAPpwgKKvJlcEGhgg49
+# 9w0BCQQxIgQgFTNCPPaPOvuFXjtSmSj6kmL7aelK+dtEo03k3KPZTlQwDQYJKoZI
+# hvcNAQEBBQAEggIAeNJXRkURPIcJyxDqW8X4frFhcWLt0akkWfV2btU74/OpewpH
+# TPDADh93//9j01mOrbbFovL+5y3G/WE3EeLuzqvrfZC6g+McInSpK9wYeOEzjkfH
+# 4ACKOImDO5WNXILKtTQyfVwRuTgmWPb6SCC6HJIipciGlfuvrNcDMBjMyAbWblLe
+# OsU/N4lf1Wjd5oaM5b9kaZ7jwHLy1LderrvE0TZW7SqttfsPuqYI+QBq7ZrIxPcW
+# JKExxsWXLAAjxaSTHSTvYBE8uSA0ptEWna46mTywe6mkOHSDpnJBldwlINpNtfEl
+# wDxZ5x3phesQ71RjaE5YYupc5lt2gmpN0xz+l5Hj31wh9at8wusIYEiERWg1lBGi
+# oZZDLoNz2xjpWnPdOWaJnXKXJ7+iz28+BgjbcvMik3T0EtB41fvImq/y6UGk4vSE
+# yYQ6NFadcuCRS7yNiiP1aNw+SuZeq7rqBHlURgMP8Bck4sJIUfM3N4ONlKShBq1K
+# lq9W0IjKYVtLPSihQAbHx63DkmsJsgXlraQ9oVbhrOI5uEr03EDw1GYWrsJRiBRL
+# YQReZP6clxEoTSHqseDFm+HWmi4hv2YuVtSVobQFax5ljn5nkXRGbjIr39lE+tX6
+# loXHW4+c9R5cgyCGUCWg4HVNMSXZbNjvSVOIRxK1cDg+62XYCpAUDVCf2f2hgg49
 # MIIOOQYKKwYBBAGCNwMDATGCDikwgg4lBgkqhkiG9w0BBwKggg4WMIIOEgIBAzEN
 # MAsGCWCGSAFlAwQCATCCAQ8GCyqGSIb3DQEJEAEEoIH/BIH8MIH5AgEBBgtghkgB
-# hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCCZdZb/xGFiMrD6qBhCroBxRx1mqylo
-# em1FaPLFXBPMkAIVAKiCDinYyFQutL7uEjxq+UqsCoEmGA8yMDIyMDUyODE0MjAx
-# MFowAwIBHqCBhqSBgzCBgDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVj
+# hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCD5Ric03I9pVDsoAfQBikG2Nk8QtF+C
+# jRKwiA3WiZoyAAIVAKlIW+qovWh/vTmKAgLa7ii9nmKzGA8yMDIyMDkyMzE2MDEy
+# OVowAwIBHqCBhqSBgzCBgDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVj
 # IENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMTEw
 # LwYDVQQDEyhTeW1hbnRlYyBTSEEyNTYgVGltZVN0YW1waW5nIFNpZ25lciAtIEcz
 # oIIKizCCBTgwggQgoAMCAQICEHsFsdRJaFFE98mJ0pwZnRIwDQYJKoZIhvcNAQEL
@@ -1339,13 +1360,13 @@ exit $ExitCode
 # BgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRlYyBU
 # cnVzdCBOZXR3b3JrMSgwJgYDVQQDEx9TeW1hbnRlYyBTSEEyNTYgVGltZVN0YW1w
 # aW5nIENBAhB71OWvuswHP6EBIwQiQU0SMAsGCWCGSAFlAwQCAaCBpDAaBgkqhkiG
-# 9w0BCQMxDQYLKoZIhvcNAQkQAQQwHAYJKoZIhvcNAQkFMQ8XDTIyMDUyODE0MjAx
-# MFowLwYJKoZIhvcNAQkEMSIEIJrNin6pWtyJQYMYct7QGz3KJVvTjMgX989V84Z+
-# T+HlMDcGCyqGSIb3DQEJEAIvMSgwJjAkMCIEIMR0znYAfQI5Tg2l5N58FMaA+eKC
-# ATz+9lPvXbcf32H4MAsGCSqGSIb3DQEBAQSCAQCqWRpON+h6MynEX4ABvFK9muwJ
-# cGs5eHW8jPArEE1fBc9E35uhJXQST3vMisqxFoNshz/F1EwIBuJRiOecHlSgW1wC
-# jA1KVq6iy+lIR4drpvJI6/y/WmcdsAuFhErvG6gAquJqyAPm2KVABLHdCTXeEiHa
-# BoiQDyIVhNxD1Z7ps9rQLhaGJLXRUc3qXjfmhtsJEeL589EJhp8+1HOD5KucjlRX
-# ETGfxAhcZZl/btFOsF/nD4G5HqXW6D6MuhO3xoGDXFoMOWM20NsVeFprTO4nJs64
-# D62Ngn3fToPTEhWM6WjglrJNaV6uc+i+ywkYwdIvKww+czJQSKXaRYkPxRS2
+# 9w0BCQMxDQYLKoZIhvcNAQkQAQQwHAYJKoZIhvcNAQkFMQ8XDTIyMDkyMzE2MDEy
+# OVowLwYJKoZIhvcNAQkEMSIEIByRkrigMw50nFG5C1eKvrGlS8ZnhBTXMhAhFl6x
+# GwufMDcGCyqGSIb3DQEJEAIvMSgwJjAkMCIEIMR0znYAfQI5Tg2l5N58FMaA+eKC
+# ATz+9lPvXbcf32H4MAsGCSqGSIb3DQEBAQSCAQBrJmQv2jU+K0w+IZbPxhLWTWse
+# LZUtQ31RIaZsNPo1Tqdx16bGqoA+JvBXffyDnnMQxVVNBrKqnPBEfff09WPeVWyn
+# SeLQJYmZPtt9ww3/9aJFmSkgeXPTJi/qBn+iymIEvYxgr1DbAY2STY05c/dwDF53
+# 760Bu3acQsT7cDMqgPxEMoIPYJRTdXXL8uBKUEZyWgHWYASpboljFSXBb0v6Hekp
+# 7hf4GPm80eOntPWpACN161wPLj9K5e7eu7/ZR9oyMWI5C/ckFnsxQgHXjEfmRK3C
+# P9iecy4hm1QE4UmDuY/DpOcodqaKT3nZ8aAdkIkHV1ayew3lrNgT8n5gfCCp
 # SIG # End signature block
Author	SHA1	Message	Date
Pete Batard	eefc2453c4	Fix handling of parentheses for -Lang option * Closes #29	2022-09-23 17:02:36 +01:00
Pete Batard	ed1a6b31a6	Fix Add-Type warnings being treated as errors on PS < 7.0 * Closes pbatard/rufus#2030	2022-09-23 16:47:44 +01:00
Pete Batard	9beb231b78	Fix Windows 7 "Referer header" error * Closes #44 * Also fix incorrect build number for Windows 11 22H2	2022-09-21 16:59:01 +01:00
Pete Batard	ce7cb583e5	Add Windows 11 22H2 builds	2022-09-20 22:57:29 +01:00
William Bulin	0287fe274e	Fixed Windows 10/11 ISO downloads * Closes #41 * Closes #42	2022-08-13 15:08:20 +01:00
Pete Batard	129e5d6f5c	Disable Windows ISO downloads * Per #41 Microsoft appear to have altered their website to make it hostile to our script. * Considering that trying to troubleshoot this is likely to take a long while, and that I sure could use some help with it, add a notice about this whole mess...	2022-08-12 14:02:34 +01:00