Mirrors/Win11Debloat
1
0
Fork 0
mirror of https://github.com/Raphire/Win11Debloat.git synced 2026-05-25 15:16:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enhance error handling and access restriction reporting in registry operations

Browse Source
This commit is contained in:
Jeffrey
2026-05-17 20:05:20 +02:00
parent 4f17727a3b
commit 54830cc928
1 changed files with 69 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
Scripts/Helpers/ApplyRegistryRegFile.ps1
View File

@@ -74,6 +74,9 @@ function Remove-RegistrySubKeyTreeIfExists {
try { try {
$RootKey.DeleteSubKeyTree($SubKeyPath, $false) $RootKey.DeleteSubKeyTree($SubKeyPath, $false)
} }
catch [System.UnauthorizedAccessException], [System.Security.SecurityException] {
throw
}
catch { catch {
# Best-effort cleanup only; missing keys are fine. # Best-effort cleanup only; missing keys are fine.
} }
@@ -117,50 +120,83 @@ function Invoke-RegistryOperationsFromRegFile {
[string]$RegFilePath [string]$RegFilePath
) )
foreach ($operation in @(Get-RegFileOperations -regFilePath $RegFilePath)) { $accessDeniedFailures = New-Object 'System.Collections.Generic.List[object]'
$keyInfo = Get-RegistryKeyForOperation -RegistryPath $operation.KeyPath -CreateIfMissing:($operation.OperationType -eq 'SetValue')
switch ($operation.OperationType) { foreach ($operation in @(Get-RegFileOperations -regFilePath $RegFilePath)) {
'DeleteKey' { try {
if ($null -ne $keyInfo.Key) { $keyInfo = Get-RegistryKeyForOperation -RegistryPath $operation.KeyPath -CreateIfMissing:($operation.OperationType -eq 'SetValue')
try {
if ($null -ne $keyInfo.SubKeyPath) { switch ($operation.OperationType) {
Remove-RegistrySubKeyTreeIfExists -RootKey $keyInfo.RootKey -SubKeyPath $keyInfo.SubKeyPath 'DeleteKey' {
if ($null -ne $keyInfo.Key) {
try {
if ($null -ne $keyInfo.SubKeyPath) {
Remove-RegistrySubKeyTreeIfExists -RootKey $keyInfo.RootKey -SubKeyPath $keyInfo.SubKeyPath
}
}
finally {
$keyInfo.Key.Close()
} }
} }
finally { }
$keyInfo.Key.Close() 'DeleteValue' {
if ($null -ne $keyInfo.Key) {
try {
$valueName = if ([string]::IsNullOrEmpty([string]$operation.ValueName)) { '' } else { [string]$operation.ValueName }
$keyInfo.Key.DeleteValue($valueName, $false)
}
finally {
$keyInfo.Key.Close()
}
} }
} }
} 'SetValue' {
'DeleteValue' { if ($null -eq $keyInfo.Key) {
if ($null -ne $keyInfo.Key) { throw "Unable to open or create registry key '$($operation.KeyPath)'"
try {
$valueName = if ([string]::IsNullOrEmpty([string]$operation.ValueName)) { '' } else { [string]$operation.ValueName }
$keyInfo.Key.DeleteValue($valueName, $false)
} }
finally {
$keyInfo.Key.Close()
}
}
}
'SetValue' {
if ($null -eq $keyInfo.Key) {
throw "Unable to open or create registry key '$($operation.KeyPath)'"
}
try { try {
$setArgs = Convert-RegOperationToValueKind -Operation $operation $setArgs = Convert-RegOperationToValueKind -Operation $operation
$keyInfo.Key.SetValue($setArgs.Name, $setArgs.Value, $setArgs.Kind) $keyInfo.Key.SetValue($setArgs.Name, $setArgs.Value, $setArgs.Kind)
}
finally {
$keyInfo.Key.Close()
}
} }
finally { default {
$keyInfo.Key.Close() throw "Unsupported reg operation type '$($operation.OperationType)' in '$RegFilePath'"
} }
} }
default {
throw "Unsupported reg operation type '$($operation.OperationType)' in '$RegFilePath'"
}
} }
catch [System.UnauthorizedAccessException], [System.Security.SecurityException] {
$valueDisplay = if ($operation.OperationType -eq 'SetValue' -or $operation.OperationType -eq 'DeleteValue') {
if ([string]::IsNullOrEmpty([string]$operation.ValueName)) { '(Default)' } else { [string]$operation.ValueName }
}
else {
''
}
$failure = [PSCustomObject]@{
OperationType = [string]$operation.OperationType
KeyPath = [string]$operation.KeyPath
ValueName = $valueDisplay
Error = $_.Exception.Message
}
$accessDeniedFailures.Add($failure)
if ([string]::IsNullOrEmpty($valueDisplay)) {
Write-Warning ("Skipping operation '{0}' on key '{1}' due to access restrictions: {2}" -f $failure.OperationType, $failure.KeyPath, $failure.Error)
}
else {
Write-Warning ("Skipping operation '{0}' on key '{1}' value '{2}' due to access restrictions: {3}" -f $failure.OperationType, $failure.KeyPath, $failure.ValueName, $failure.Error)
}
continue
}
}
if ($accessDeniedFailures.Count -gt 0) {
Write-Warning ("Registry fallback import completed with $($accessDeniedFailures.Count) access-restricted operation(s) skipped in '$RegFilePath'.")
} }
} }