Update SystemTester.ps1

Author: Pnwcomputers

SystemTester.ps1

@@ -1,20 +1,18 @@
-# Portable Sysinternals System Tester - FINAL MERGED VERSION
+# Portable Sysinternals System Tester
 # Created by Pacific Northwest Computers - 2025
-# Complete Production Version - v2.2 (Merged and Debugged)
+# Complete Production Version - v2.2
 
 param([switch]$AutoRun)
 
 # Constants
 $script:VERSION = "2.2"
-$script:DXDIAG_TIMEOUT = 50
-$script:ENERGY_DURATION = 20
-$script:CPU_TEST_SECONDS = 30
+$script:DXDIAG_TIMEOUT = 45
+$script:ENERGY_DURATION = 15
+$script:CPU_TEST_SECONDS = 10
 $script:MAX_PATH_LENGTH = 240
 $script:MIN_TOOL_SIZE_KB = 50
-$script:DNS_TEST_TARGETS = @("google.com", "microsoft.com", "cloudflare.com", "github.com") # Added DNS Targets
 
 # Paths
-# Uses the more robust method for getting the script root regardless of launch method
 $ScriptRoot = if ($PSScriptRoot) { $PSScriptRoot } else { Split-Path -Parent $MyInvocation.MyCommand.Path }
 $DriveLetter = (Split-Path -Qualifier $ScriptRoot).TrimEnd('\')
 $SysinternalsPath = Join-Path $ScriptRoot "Sysinternals"
@@ -31,7 +29,6 @@ Write-Host "Running from: $DriveLetter" -ForegroundColor Cyan
 
 # Detect if launched via batch file
 function Test-LauncherAwareness {
-    # ... (code unchanged)
     try {
         $parentPID = (Get-Process -Id $PID).Parent.Id
         if ($parentPID) {
@@ -49,7 +46,6 @@ function Test-LauncherAwareness {
 
 # Check admin privileges
 function Test-AdminPrivileges {
-    # ... (code unchanged)
     try {
         $identity = [Security.Principal.WindowsIdentity]::GetCurrent()
         $principal = New-Object Security.Principal.WindowsPrincipal($identity)
@@ -67,12 +63,22 @@ function Test-AdminPrivileges {
 
 # Tool integrity verification
 function Test-ToolIntegrity {
-    # ... (code unchanged)
     param([string]$ToolName)
 
     $toolPath = Join-Path $SysinternalsPath "$ToolName.exe"
 
-    # ... (rest of function logic)
+    # Check if file exists
+    if (!(Test-Path $toolPath)) {
+        return @{Status="MISSING"; Details="File not found"}
+    }
+    
+    # Check file size
+    $fileInfo = Get-Item $toolPath
+    if ($fileInfo.Length -lt ($script:MIN_TOOL_SIZE_KB * 1KB)) {
+        return @{Status="BAD_SIZE"; Details="File too small: $($fileInfo.Length) bytes"}
+    }
+    
+    # Check digital signature
     try {
         $signature = Get-AuthenticodeSignature $toolPath -ErrorAction Stop
 
@@ -93,6 +99,104 @@ function Test-ToolIntegrity {
     }
 }
 
+# Verify all tools
+function Test-ToolVerification {
+    Write-Host "`n========================================" -ForegroundColor Cyan
+    Write-Host "  TOOL INTEGRITY VERIFICATION" -ForegroundColor Cyan
+    Write-Host "========================================" -ForegroundColor Cyan
+    Write-Host ""
+    
+    $allTools = @(
+    "psinfo","coreinfo","pslist","handle","clockres",
+    "autorunsc","du","streams","contig","sigcheck",
+    "testlimit","diskext","listdlls"
+    )
+    
+    $stats = @{
+        VALID_MS=0; VALID_OTHER=0; NOT_SIGNED=0
+        BAD_SIZE=0; BAD_SIGNATURE=0; MISSING=0; CHECK_FAILED=0
+    }
+    
+    foreach ($tool in $allTools) {
+        $result = Test-ToolIntegrity -ToolName $tool
+        $stats[$result.Status]++
+        
+        $color = switch ($result.Status) {
+            "VALID_MS" { "Green" }
+            "VALID_OTHER" { "Cyan" }
+            "NOT_SIGNED" { "Yellow" }
+            "MISSING" { "Red" }
+            "BAD_SIZE" { "Red" }
+            "BAD_SIGNATURE" { "Red" }
+            "CHECK_FAILED" { "Yellow" }
+        }
+        
+        $statusText = switch ($result.Status) {
+            "VALID_MS" { "[OK-MS]" }
+            "VALID_OTHER" { "[OK-OTHER]" }
+            "NOT_SIGNED" { "[NO-SIG]" }
+            "MISSING" { "[MISSING]" }
+            "BAD_SIZE" { "[BAD-SIZE]" }
+            "BAD_SIGNATURE" { "[BAD-SIG]" }
+            "CHECK_FAILED" { "[ERROR]" }
+        }
+        
+        Write-Host "$statusText $tool" -ForegroundColor $color
+        if ($result.Details -and $result.Status -ne "VALID_MS") {
+            Write-Host "         $($result.Details)" -ForegroundColor DarkGray
+        }
+    }
+    
+    Write-Host ""
+    Write-Host "========================================" -ForegroundColor Cyan
+    Write-Host "SUMMARY:" -ForegroundColor White
+    Write-Host "  Valid (Microsoft): $($stats.VALID_MS)" -ForegroundColor Green
+    Write-Host "  Valid (Other): $($stats.VALID_OTHER)" -ForegroundColor Cyan
+    Write-Host "  Not Signed: $($stats.NOT_SIGNED)" -ForegroundColor Yellow
+    Write-Host "  Bad Size: $($stats.BAD_SIZE)" -ForegroundColor Red
+    Write-Host "  Bad Signature: $($stats.BAD_SIGNATURE)" -ForegroundColor Red
+    Write-Host "  Missing: $($stats.MISSING)" -ForegroundColor Red
+    Write-Host "  Check Failed: $($stats.CHECK_FAILED)" -ForegroundColor Yellow
+    Write-Host ""
+    
+    $totalIssues = $stats.BAD_SIZE + $stats.BAD_SIGNATURE + $stats.MISSING + $stats.CHECK_FAILED
+    if ($totalIssues -eq 0 -and $stats.VALID_MS -gt 0) {
+        Write-Host "STATUS: All present tools are verified and safe to use" -ForegroundColor Green
+    } elseif ($totalIssues -gt 0) {
+        Write-Host "STATUS: $totalIssues issue(s) detected - recommend re-download" -ForegroundColor Yellow
+        if ($script:LaunchedViaBatch) {
+            Write-Host "ACTION: Use Batch Menu Option 5 to re-download tools" -ForegroundColor Yellow
+        }
+    }
+    Write-Host ""
+}
+
+# Initialize environment
+function Initialize-Environment {
+    Write-Host "Initializing..." -ForegroundColor Yellow
+    
+    Test-LauncherAwareness | Out-Null
+    Test-AdminPrivileges | Out-Null
+
+    # Path length check
+    if ($ScriptRoot.Length -gt $script:MAX_PATH_LENGTH) {
+        Write-Host "WARNING: Path length is $($ScriptRoot.Length) chars" -ForegroundColor Yellow
+        Write-Host "         Consider moving to shorter path (Windows limit: 260)" -ForegroundColor Yellow
+    }
+
+    # Check tools folder
+    if (!(Test-Path $SysinternalsPath)) {
+        Write-Host "ERROR: Sysinternals folder not found!" -ForegroundColor Red
+        Write-Host "Expected: $SysinternalsPath" -ForegroundColor Yellow
+        if ($script:LaunchedViaBatch) {
+            Write-Host "ACTION: Use Batch Menu Option 5 to download tools automatically" -ForegroundColor Yellow
+        } else {
+            Write-Host "ACTION: Download from https://download.sysinternals.com/files/SysinternalsSuite.zip" -ForegroundColor Yellow
+            Write-Host "        Extract to: $SysinternalsPath" -ForegroundColor Yellow
+        }
+        return $false
+    }
+
     # Check for key tools
     $tools = @("psinfo.exe","coreinfo.exe","pslist.exe","handle.exe","clockres.exe")
     $found = 0
@@ -163,7 +267,7 @@ function Clean-ToolOutput {
     return ($cleaned | Select-Object -First 40) -join "`n"
 }
 
-# Run tool (Uses v2.2 reliable call & quotes path for spaces)
+# Run tool
 function Run-Tool {
     param(
         [string]$ToolName,
@@ -190,20 +294,13 @@ function Run-Tool {
     Write-Host "Running $ToolName..." -ForegroundColor Cyan
     try {
         $start = Get-Date
-        
-        # Add -accepteula for necessary tools (from v2.2 logic)
-        if ($ToolName -in @("psinfo","pslist","handle","autorunsc","testlimit","contig","coreinfo","streams","sigcheck")) {
+        if ($ToolName -in @("psinfo","pslist","handle","autorunsc","testlimit","contig")) {
             $Args = "-accepteula $Args"
         }
 
-        # ARG FIX: This ensures the path is quoted to handle spaces (like in C:\Users\Jon Pienkowski)
         $argArray = if ($Args.Trim()) { $Args.Split(' ') | Where-Object { $_ } } else { @() }
-        
-        # *** CRITICAL FIX: Quote the executable path ***
-        $rawOutput = & "$toolPath" $argArray 2>&1 | Out-String
-        
+        $rawOutput = & $toolPath $argArray 2>&1 | Out-String
         $duration = ((Get-Date) - $start).TotalMilliseconds
-        
         $cleanOutput = Clean-ToolOutput -ToolName $ToolName -RawOutput $rawOutput
 
         $script:TestResults += @{
@@ -220,17 +317,13 @@ function Run-Tool {
         Write-Host "ERROR: $ToolName - $($_.Exception.Message)" -ForegroundColor Red
     }
 }
-# ----------------------------------------------------
-# END UTILITY FUNCTIONS
-# ----------------------------------------------------
 
 # Test: System Info
 function Test-SystemInfo {
     Write-Host "`n=== System Information ===" -ForegroundColor Green
     Run-Tool -ToolName "psinfo" -Args "-h -s -d" -Description "System information"
     Run-Tool -ToolName "clockres" -Description "Clock resolution"
 
-    # Get WMI info and store in System-Overview
     try {
         $os = Get-CimInstance Win32_OperatingSystem -ErrorAction Stop
         $cs = Get-CimInstance Win32_ComputerSystem -ErrorAction Stop
@@ -257,7 +350,6 @@ function Test-CPU {
     Write-Host "`n=== CPU Testing ===" -ForegroundColor Green
     Run-Tool -ToolName "coreinfo" -Args "-v -f -c" -Description "CPU architecture"
 
-    # Get WMI CPU details
     try {
         $cpu = Get-CimInstance Win32_Processor -ErrorAction Stop | Select-Object -First 1
         $info = @"
@@ -277,11 +369,6 @@ L3 Cache: $($cpu.L3CacheSize) KB
         Write-Host "Error getting CPU details" -ForegroundColor Yellow
     }
 
-    # Run remaining CPU-related tools
-    Run-Tool -ToolName "pslist" -Args "-t" -Description "Process tree snapshot"
-    Run-Tool -ToolName "handle" -Args "-p explorer" -Description "Explorer handles"
-    
-    # CPU stress test
     Write-Host "Running CPU test ($script:CPU_TEST_SECONDS sec - synthetic)..." -ForegroundColor Yellow
     try {
         $start = Get-Date
@@ -462,17 +549,6 @@ function Test-StorageSMART {
 
         if (-not $lines) { $lines = @("SMART data not available (driver limitation)") }
 
-    Write-Host "Running DISM and SFC (may take 5-15 min)..." -ForegroundColor Yellow
-    try {
-        $start = Get-Date
-        # DISM
-        Write-Host "  Running DISM..." -ForegroundColor Yellow
-        $dismResult = DISM /Online /Cleanup-Image /CheckHealth 2>&1 | Out-String
-        # SFC
-        Write-Host "  Running SFC..." -ForegroundColor Yellow
-        $sfcResult = sfc /scannow 2>&1 | Out-String
-        $duration = ((Get-Date) - $start).TotalMilliseconds
-        
         $script:TestResults += @{
             Tool="Storage-SMART"; Description="SMART data"
             Status="SUCCESS"; Output=($lines -join "`n"); Duration=100
@@ -502,7 +578,7 @@ function Test-Trim {
             Tool="SSD-TRIM"; Description="TRIM status"
             Status="SUCCESS"; Output=($txt -join "`n"); Duration=50
         }
-        Write-Host "SMART data collected" -ForegroundColor Green
+        Write-Host "TRIM status collected" -ForegroundColor Green
     } catch {
         Write-Host "TRIM check failed" -ForegroundColor Yellow
     }
@@ -662,7 +738,7 @@ function Test-GPU {
             Start-Sleep -Milliseconds 500
             $elapsed += 0.5
         }
-
+        
         if (Test-Path $dx) {
             Start-Sleep -Seconds 1
             $raw = Get-Content $dx -Raw -ErrorAction Stop
@@ -1120,11 +1196,6 @@ function Generate-Report {
             $recommendations += "• GOOD: Low memory usage ($usage%) - plenty of RAM available"
         }
     }
-    
-    # --- 5. RECOMMENDATIONS ENGINE ---
-    $cleanReport += ""
-    $cleanReport += "RECOMMENDATIONS:"
-    $cleanReport += "----------------"
 
     # === STORAGE HEALTH ===
     $smartInfo = $TestResults | Where-Object {$_.Tool -eq "Storage-SMART"}
@@ -1417,7 +1488,7 @@ function Show-Menu {
     Write-Host "18. Clear Results" -ForegroundColor Red
     Write-Host "Q.  Quit"
     Write-Host ""
-    Write-Host "Tests completed: $($script:TestResults.Count)" -ForegroundColor Gray
+    Write-Host "Tests completed: $($TestResults.Count)" -ForegroundColor Gray
 }
 
 function Start-Menu {