Mirrors/Win11Debloat
1
0
Fork 0
mirror of https://github.com/Raphire/Win11Debloat.git synced 2026-05-24 14:46:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Invoke-RegistryOperationsFromRegFile to optimize operation handling and improve access restriction reporting

Browse Source
This commit is contained in:
Jeffrey
2026-05-17 23:16:32 +02:00
parent c945789d58
commit 05bd5f4c56
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Scripts/Helpers/ApplyRegistryRegFile.ps1
View File

@@ -135,8 +135,10 @@ function Invoke-RegistryOperationsFromRegFile {
) )
$accessDeniedCount = 0 $accessDeniedCount = 0
$operations = @(Get-RegFileOperations -regFilePath $RegFilePath)
$totalOperations = $operations.Count
foreach ($operation in @(Get-RegFileOperations -regFilePath $RegFilePath)) { foreach ($operation in $operations) {
try { try {
$keyInfo = Get-RegistryKeyForOperation -RegistryPath $operation.KeyPath -CreateIfMissing:($operation.OperationType -eq 'SetValue') -OpenKey:($operation.OperationType -ne 'DeleteKey') $keyInfo = Get-RegistryKeyForOperation -RegistryPath $operation.KeyPath -CreateIfMissing:($operation.OperationType -eq 'SetValue') -OpenKey:($operation.OperationType -ne 'DeleteKey')
@@ -193,6 +195,10 @@ function Invoke-RegistryOperationsFromRegFile {
} }
} }
if ($totalOperations -gt 0 -and $accessDeniedCount -eq $totalOperations) {
throw "Registry fallback import could not apply any operations in '$RegFilePath' because all $accessDeniedCount operation(s) were blocked by access restrictions."
}
if ($accessDeniedCount -gt 0) { if ($accessDeniedCount -gt 0) {
Write-Warning "Registry fallback import completed with $accessDeniedCount access-restricted operation(s) skipped in '$RegFilePath'." Write-Warning "Registry fallback import completed with $accessDeniedCount access-restricted operation(s) skipped in '$RegFilePath'."
} }
@@ -213,7 +219,7 @@ function Invoke-RegistryImportViaPowerShell {
} }
if ($UseOfflineHive) { if ($UseOfflineHive) {
if (Get-Command -Name Invoke-WithLoadedBackupHive -ErrorAction SilentlyContinue) { if ((Get-Command -Name Invoke-WithLoadedBackupHive -ErrorAction SilentlyContinue) -and -not $HiveAlreadyLoaded.IsPresent) {
return Invoke-WithLoadedBackupHive -ScriptBlock $applyScript -ArgumentObject $RegFilePath return Invoke-WithLoadedBackupHive -ScriptBlock $applyScript -ArgumentObject $RegFilePath
} }
@@ -221,7 +227,7 @@ function Invoke-RegistryImportViaPowerShell {
throw "Offline hive path was not provided for fallback import of '$RegFilePath'" throw "Offline hive path was not provided for fallback import of '$RegFilePath'"
} }
if (-not $HiveAlreadyLoaded) { if (-not $HiveAlreadyLoaded.IsPresent) {
$global:LASTEXITCODE = 0 $global:LASTEXITCODE = 0
reg load "HKU\Default" $OfflineHiveDatPath | Out-Null reg load "HKU\Default" $OfflineHiveDatPath | Out-Null
$loadExitCode = $LASTEXITCODE $loadExitCode = $LASTEXITCODE