Add VersionInfo filtering and PATH scan

- Only DLLs with VersionInfo are now registered, improving safety (previously, all matching files were considered)
- Added optional scan of directories in system PATH for extended support of custom/unofficial DLLs
- Registry cleanup, bitness and signature checks, and duplicate prevention remain unchanged
- Improved user messages and scan feedback

Author: TantalusDrive

amdocl-fix.ps1

@@ -17,13 +17,11 @@ param(
     [switch]$AllowUnsigned = $true
 )
 
-# AMD OpenCL registry hives
 $roots = @(
-    "HKLM:\SOFTWARE\Khronos\OpenCL\Vendors",        # 64-bit
-    "HKLM:\SOFTWARE\WOW6432Node\Khronos\OpenCL\Vendors"  # 32-bit
+    "HKLM:\SOFTWARE\Khronos\OpenCL\Vendors",
+    "HKLM:\SOFTWARE\WOW6432Node\Khronos\OpenCL\Vendors"
 )
 
-# Standard AMD directories scanned for OpenCL ICDs
 $scanDirs = @(
     "$env:WINDIR\System32",
     "$env:WINDIR\SysWOW64",
@@ -37,42 +35,33 @@ function Get-DllBitness {
     try {
         $fs = [System.IO.File]::Open($Path, 'Open', 'Read', 'Read')
         $br = New-Object System.IO.BinaryReader($fs)
-
-        # Read PE header offset
         $fs.Seek(0x3C, 'Begin') | Out-Null
         $peOffset = $br.ReadInt32()
-
-        # Read machine field
         $fs.Seek($peOffset + 4, 'Begin') | Out-Null
         $machine = $br.ReadUInt16()
-
         $br.Close(); $fs.Close()
-
         switch ($machine) {
-            0x8664 { return 64 } # AMD64
-            0x014C { return 32 } # I386
+            0x8664 { return 64 }
+            0x014C { return 32 }
             default { return $null }
         }
     } catch { return $null }
 }
 
 function Safe-Remove {
     param($root,$name)
-    try {
-        Remove-ItemProperty -Path $root -Name $name -Force
-    } catch { $global:hadErrors = $true }
+    try { Remove-ItemProperty -Path $root -Name $name -Force }
+    catch { $global:hadErrors = $true }
 }
 
 function Safe-Add {
     param($root,$name)
-    try {
-        New-ItemProperty -Path $root -Name $name -Value 0 -PropertyType DWord -Force | Out-Null
-    } catch { $global:hadErrors = $true }
+    try { New-ItemProperty -Path $root -Name $name -Value 0 -PropertyType DWord -Force | Out-Null }
+    catch { $global:hadErrors = $true }
 }
 
 function Is-SignatureAcceptable {
     param($sig, $AllowUnsigned)
-
     if ($sig.Status -eq 'Valid') { return $true }
     if ($AllowUnsigned -and ($sig.Status -eq 'NotSigned' -or $sig.Status -eq 'Unknown')) {
         return $true
@@ -82,95 +71,71 @@ function Is-SignatureAcceptable {
 
 function Register-OpenCLDLL {
     param([string]$dllPath, [switch]$AllowUnsigned)
-
     if (-not (Test-Path $dllPath)) { return }
-
     $sig = Get-AuthenticodeSignature -FilePath $dllPath
     if (-not (Is-SignatureAcceptable $sig $AllowUnsigned)) { return }
-
     $bit = Get-DllBitness $dllPath
     if ($bit -eq 64)      { $root = $roots[0] }
     elseif ($bit -eq 32) { $root = $roots[1] }
     else                 { return }
-
     $exists = (Get-ItemProperty -Path $root -ErrorAction SilentlyContinue).PSObject.Properties |
               Where-Object { $_.Name -eq $dllPath }
-
     if (-not $exists) {
         Safe-Add $root $dllPath
-        Write-Host "Added ($bit-bit): $dllPath" -ForegroundColor Cyan
+        Write-Host "[+ $bit bit] Added: $dllPath" -ForegroundColor Cyan
     }
 }
 
-# ----------------------------------------------------------
-# 1) SAFE CLEANUP
-# ----------------------------------------------------------
-
+# Registry cleanup: remove invalid, missing, or misplaced entries
 foreach ($root in $roots) {
-
     Write-Host "`nAnalyzing: $root" -ForegroundColor Cyan
-
     $entries = Get-ItemProperty -Path $root -ErrorAction SilentlyContinue
     if (-not $entries) {
         Write-Host "No entries found or key missing."
         continue
     }
-
     foreach ($prop in $entries.PSObject.Properties) {
-
         $dll = $prop.Name
         if ($dll -notlike "*amdocl*.dll") { continue }
-
         if (-not (Test-Path $dll)) {
-            Write-Host "Removed: $dll (file missing)" -ForegroundColor Yellow
+            Write-Host "Removed: $dll (file not found)" -ForegroundColor Yellow
             Safe-Remove $root $dll
             continue
         }
-
         $sig = Get-AuthenticodeSignature -FilePath $dll
         if (-not (Is-SignatureAcceptable $sig $AllowUnsigned)) {
             Write-Host "Removed: $dll (invalid signature)" -ForegroundColor Yellow
             Safe-Remove $root $dll
             continue
         }
-
         $bit = Get-DllBitness $dll
         if ($bit -eq $null) {
-            Write-Host "Removed: $dll (bitness not detectable)" -ForegroundColor Yellow
+            Write-Host "Removed: $dll (architecture not detected)" -ForegroundColor Yellow
             Safe-Remove $root $dll
             continue
         }
-
         $correctRoot = if ($bit -eq 64) { $roots[0] } else { $roots[1] }
-
         if ($correctRoot -ne $root) {
-            Write-Host "Fixed hive mismatch ($bit-bit): $dll" -ForegroundColor Yellow
+            Write-Host "Moved ($bit bit): $dll" -ForegroundColor Yellow
             Safe-Remove $root $dll
-
             $existsDest = (Get-ItemProperty -Path $correctRoot -ErrorAction SilentlyContinue).PSObject.Properties |
                           Where-Object { $_.Name -eq $dll }
-
             if (-not $existsDest) {
                 Safe-Add $correctRoot $dll
             }
             continue
         }
-
         Write-Host "OK: $dll" -ForegroundColor Green
     }
 }
 
-# ----------------------------------------------------------
-# 2) COHERENT REBUILD (improved)
-# ----------------------------------------------------------
-
-Write-Host "`nRebuilding..." -ForegroundColor Cyan
+# Register all valid DLLs found in each directory (no duplicates)
+Write-Host "`nRegistering all valid AMD OpenCL DLLs from standard directories..." -ForegroundColor Cyan
 
 foreach ($dir in $scanDirs) {
     if (-not (Test-Path $dir)) { continue }
-
     Get-ChildItem -Path $dir -Filter "amdocl*.dll" -Recurse -ErrorAction SilentlyContinue |
-        Sort-Object { $_.VersionInfo.FileVersionRaw } -Descending -ErrorAction SilentlyContinue |
+        Where-Object { $_.VersionInfo.FileVersionRaw } |
         ForEach-Object {
             Register-OpenCLDLL -dllPath $_.FullName -AllowUnsigned:$AllowUnsigned
         }
@@ -179,7 +144,25 @@ foreach ($dir in $scanDirs) {
 if ($hadErrors) {
     Write-Host "`nCompleted with warnings." -ForegroundColor Yellow
 } else {
-    Write-Host "`nCompleted successfully." -ForegroundColor Green
+    Write-Host "`nCompleted." -ForegroundColor Green
+}
+
+# Optional PATH scan
+Write-Host "`nDo you want to include an extended scan of system PATH directories? (Recommended only for custom or unofficial DLLs)" -ForegroundColor Yellow
+$input = Read-Host "Type Y to scan, anything else to skip"
+if ($input -eq 'Y' -or $input -eq 'y') {
+    Write-Host "`nNote: DLLs found in PATH may be unofficial or obsolete." -ForegroundColor Magenta
+    $pathDirs = ($env:PATH -split ';' | Where-Object { Test-Path $_ })
+    foreach ($dir in $pathDirs) {
+        Get-ChildItem -Path $dir -Filter "amdocl*.dll" -Recurse -ErrorAction SilentlyContinue |
+            Where-Object { $_.VersionInfo.FileVersionRaw } |
+            ForEach-Object {
+                Register-OpenCLDLL -dllPath $_.FullName -AllowUnsigned:$AllowUnsigned
+            }
+    }
+    Write-Host "`nPATH scan completed." -ForegroundColor Cyan
+} else {
+    Write-Host "`nPATH scan skipped."
 }
 
 Read-Host "Press Enter to exit"