Jockes update

Author: itsmikethetech

.gitignore

@@ -4,6 +4,3 @@ input/MttVDD.dll
 input/MttVDD.inf
 input/mttvdd.cat
 input/vdd_settings.xml
-
-**/.claude/settings.local.json
-CLAUDE.md

Setup.iss

@@ -6,8 +6,6 @@
 #define MyAppURL "https://vdd.mikethetech.com"
 #define InstallPath "C:\VirtualDisplayDriver"
 #define AppId "VirtualDisplayDriver"
-#define RegKeyBase "SOFTWARE\MikeTheTech\VirtualDisplayDriver"
-#define InstallerTempDir "{localappdata}\VDDInstaller"
 
 [Setup]
 //no network storage installs
@@ -50,10 +48,8 @@ DisableDirPage=yes
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Dirs]
-; These directories will be automatically created during installation
-; with the specified permissions
-Name: "{app}"; Permissions: everyone-full; Flags: uninsalwaysuninstall
-Name: "{app}\ControlApp"; Permissions: everyone-full; Flags: uninsalwaysuninstall
+Name: "{app}"; Permissions: everyone-full
+Name: "{app}\ControlApp"; Permissions: everyone-full
 
 [Files]
 Source: "input\MttVDD.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: VDD
@@ -67,9 +63,6 @@ Source: "dependencies\install.bat"; DestDir: "{app}"; Flags: ignoreversion
 Source: "dependencies\uninstall.bat"; DestDir: "{app}"; Flags: ignoreversion
 Source: "dependencies\fixxml.ps1"; DestDir: "{app}"; Flags: ignoreversion
 Source: "input\ControlApp\VDDControl.exe"; DestDir: "{app}\ControlApp"; Components: ControlApp
-; Include PowerShell scripts
-Source: "input\scripts\*.ps1"; DestDir: "{app}\scripts"; Flags: ignoreversion
-Source: "input\scripts\onoff_at_loginout\*"; DestDir: "{app}\scripts\onoff_at_loginout"; Flags: ignoreversion
 
 [Types]
 Name: "basic"; Description: "Basic install with driver and control app (recommended)"; 
@@ -105,7 +98,7 @@ function IsAppAlreadyInstalled(): Boolean;
 var
   InstalledBy: string;
 begin
-  Result := RegQueryStringValue(HKEY_LOCAL_MACHINE, '{#RegKeyBase}', 'InstalledBy', InstalledBy);
+  Result := RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\MikeTheTech\VirtualDisplayDriver', 'InstalledBy', InstalledBy);
   if Result then
     Log('App is already installed by: ' + InstalledBy)
   else
@@ -166,148 +159,55 @@ end;
 
 procedure EnsureFilesAndDirectoryExist();
 var
-  Src, Dest, TempDir: String;
-  FileCopyResult: Boolean;
+  Src, Dest: String;
 begin
-  // Extract necessary files to temp directory
-  try
-    ExtractTemporaryFile('getlist.bat');
-  except
-    Log('Warning: Failed to extract getlist.bat to temporary directory');
-  end;
-    
-  try
-    ExtractTemporaryFile('gpulist.txt');
-  except
-    Log('Warning: Failed to extract gpulist.txt to temporary directory');
-  end;
-  
-  // Create installer temp directory if it doesn't exist
-  TempDir := ExpandConstant('{#InstallerTempDir}');
-  if not DirExists(TempDir) then
-  begin
-    if not CreateDir(TempDir) then
-    begin
-      Log('Error: Failed to create directory: ' + TempDir);
-      MsgBox('Failed to create the required temporary directory. ' +
-             'The installation may not complete successfully.', mbError, MB_OK);
-      Exit;
-    end;
-  end;
-  
-  // Copy the getlist.bat file
+  ExtractTemporaryFile('getlist.bat');
+  ExtractTemporaryFile('gpulist.txt');
+  if not DirExists(ExpandConstant('{localappdata}\VDDInstaller')) then
+    CreateDir(ExpandConstant('{localappdata}\VDDInstaller'));
+  Src := ExpandConstant('{tmp}\lfn.exe');
+  Dest := ExpandConstant('{localappdata}\VDDInstaller\lfn.exe');
+  if not FileExists(Dest) then
+    FileCopy(Src, Dest, False);
   Src := ExpandConstant('{tmp}\getlist.bat');
-  Dest := TempDir + '\getlist.bat';
-  
-  if FileExists(Src) then
-  begin
-    if not FileExists(Dest) then
-    begin
-      FileCopyResult := FileCopy(Src, Dest, True);
-      if not FileCopyResult then
-        Log('Error: Failed to copy ' + Src + ' to ' + Dest);
-    end;
-  end
-  else
-    Log('Error: Source file not found: ' + Src);
-    
-  // Copy the gpulist.txt file
+  Dest := ExpandConstant('{localappdata}\VDDInstaller\getlist.bat');
+  if not FileExists(Dest) then
+    FileCopy(Src, Dest, False);
   Src := ExpandConstant('{tmp}\gpulist.txt');
-  Dest := TempDir + '\gpulist.txt';
-  
-  if FileExists(Src) then
-  begin
-    if not FileExists(Dest) then
-    begin
-      FileCopyResult := FileCopy(Src, Dest, True);
-      if not FileCopyResult then
-        Log('Error: Failed to copy ' + Src + ' to ' + Dest);
-    end;
-  end
-  else
-    Log('Error: Source file not found: ' + Src);
+  Dest := ExpandConstant('{localappdata}\VDDInstaller\gpulist.txt');
+  if not FileExists(Dest) then
+    FileCopy(Src, Dest, False);
 end;
 
 procedure RunGetListAndPopulateGPUComboBox;
 var
   I, ResultCode: Integer;
-  ListPath, GetListPath, TempDir: String;
+  ListPath: String;
 begin
-  // Add default option
   GPUComboBox.Items.Add('Best GPU (Auto)'); 
   
-  // Ensure necessary files are available
   EnsureFilesAndDirectoryExist();
-  
-  // Use defined constant for temp directory
-  TempDir := ExpandConstant('{#InstallerTempDir}');
-  GetListPath := TempDir + '\getlist.bat';
-  ListPath := TempDir + '\gpulist.txt';
-  
-  // Verify getlist.bat exists
-  if not FileExists(GetListPath) then
+  ListPath := ExpandConstant('{localappdata}\VDDInstaller\gpulist.txt');
+  if not FileExists(ExpandConstant('{localappdata}\VDDInstaller\getlist.bat')) then
   begin
-    Log('Error: getlist.bat not found at: ' + GetListPath);
-    MsgBox('Error: GPU listing utility not found. You can still proceed with installation ' +
-           'but GPU selection may not work properly.', mbError, MB_OK);
-    GPUComboBox.ItemIndex := 0;
+    MsgBox('Error: getlist.bat not found.', mbError, MB_OK);
     Exit;
   end;
-  
-  // Execute getlist.bat to gather GPU information
-  Log('Executing: ' + GetListPath);
-  if Exec(GetListPath, '', '', SW_HIDE, ewWaitUntilTerminated, ResultCode) then
+  if Exec(ExpandConstant('{localappdata}\VDDInstaller\getlist.bat'), '', '', SW_HIDE, ewWaitUntilTerminated, ResultCode) then
   begin
-    Log('getlist.bat executed with result code: ' + IntToStr(ResultCode));
-    
-    if ResultCode <> 0 then
-    begin
-      Log('Warning: getlist.bat exited with non-zero code: ' + IntToStr(ResultCode));
-    end;
-    
-    // Load GPU list if available
     if FileExists(ListPath) then
     begin
       GPUList := TStringList.Create;
       try
-        try
-          GPUList.LoadFromFile(ListPath);
-          Log('Loaded ' + IntToStr(GPUList.Count) + ' GPUs from list');
-          
-          for I := 0 to GPUList.Count - 1 do
-          begin
-            if Trim(GPUList[I]) <> '' then
-            begin
-              GPUComboBox.Items.Add(GPUList[I]);
-              Log('Added GPU: ' + GPUList[I]);
-            end;
-          end;
-        except
-          begin
-            Log('Error loading GPU list');
-            MsgBox('Error loading GPU list. Default GPU selection will be used.', mbError, MB_OK);
-          end;
-        end;
+        GPUList.LoadFromFile(ListPath);
+        for I := 0 to GPUList.Count -1 do
+          GPUComboBox.Items.Add(GPUList[I]);
       finally
-        GPUList.Free;
+          GPUList.Free;
       end;
-    end
-    else
-    begin
-      Log('Warning: GPU list file not found at: ' + ListPath);
-      MsgBox('Could not find the GPU list. Default GPU selection will be used.', mbInformation, MB_OK);
     end;
-  end
-  else
-  begin
-    Log('Error: Failed to execute getlist.bat');
-    MsgBox('Failed to detect GPUs. Default GPU selection will be used.', mbError, MB_OK);
   end;
-  
-  // Ensure a default selection is made
   GPUComboBox.ItemIndex := 0;
-  
-  Log('GPU initialization completed');
 end;
 
 function NextButtonClick(CurPageID: Integer): Boolean;
@@ -361,24 +261,8 @@ begin
   Result := MonitorsEdit.Text;
 end;
 
-function GetInstallDate(Param: string): string;
-begin
-  // Format as yyyy-mm-dd using GetDateTimeString
-  Result := GetDateTimeString('yyyy-mm-dd', '-', '-');
-end;
-
 function MergePar(Param: string): string;
 begin
-  { 
-    Properly quote parameters to handle paths with spaces.
-    The third parameter (%3 in install.bat) is the installation path.
-    
-    Jocke's fix in install.bat:
-    1. For PowerShell: powershell script gets path with special quoting "\"%AppPath%\""
-    2. For nefconw.exe: Driver installation uses special quoting "\"%AppPath%\MttVDD.inf\""
-    
-    Both approaches ensure paths with spaces work correctly.
-  }
   Result := Format('%s "%s" "%s"', [
     ExpandConstant('{code:GetVDCount}'),
     ExpandConstant('{code:GetSelectedGPU}'),
@@ -432,11 +316,9 @@ end;
 
 [Registry]
 Root: HKLM; Subkey: "SOFTWARE\MikeTheTech"; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: "{#RegKeyBase}"; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: "{#RegKeyBase}"; ValueType: string; ValueName: "VDDPATH"; ValueData: "{app}"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "{#RegKeyBase}"; ValueType: string; ValueName: "InstalledBy"; ValueData: "Installer"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "{#RegKeyBase}"; ValueType: string; ValueName: "InstallDate"; ValueData: "{code:GetInstallDate}"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "{#RegKeyBase}"; ValueType: string; ValueName: "Version"; ValueData: "{#MyAppVersion}"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "SOFTWARE\MikeTheTech\VirtualDisplayDriver"; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: "SOFTWARE\MikeTheTech\VirtualDisplayDriver"; ValueType: string; ValueName: "VDDPATH"; ValueData: "{app}"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "SOFTWARE\MikeTheTech\VirtualDisplayDriver"; ValueType: string; ValueName: "InstalledBy"; ValueData: "Installer"; Flags: uninsdeletevalue
 
 
 [Run]

dependencies/fixxml.ps1

@@ -4,108 +4,17 @@ param (
     [string]$GPUFN,
     [string]$InstallDir
 )
-
-# Remove any extra quotes that might have been added by Jocke's fix in install.bat
-$InstallDir = $InstallDir.Trim('"')
-Write-Host "Installing to path: $InstallDir"
-
-# Define file paths
 $file1="$InstallDir\vdd_settings.xml"
 $file2="$InstallDir\scripts\onoff_at_loginout\psscripts.ini"
 $file3="$InstallDir\scripts\onoff_at_loginout\vdd_e-li_d-lo.cmd"
 $file4="$InstallDir\uninstall.bat"
 
-# Define the default installation path that needs to be replaced
-$defaultPath = "C:\VirtualDisplayDriver"
-$newPath = "$InstallDir"
-
-# Note: Path handling for spaces is already correct here.
-# PowerShell handles paths with spaces properly when variables are properly quoted,
-# which we've done throughout this script. Jocke's fix in install.bat complements this.
-
-# Function to safely update file content
-function Update-FileContent {
-    param (
-        [string]$FilePath,
-        [string]$OldValue,
-        [string]$NewValue,
-        [string]$FileDescription
-    )
-    
-    try {
-        if (-not (Test-Path $FilePath)) {
-            Write-Warning "File not found: $FilePath ($FileDescription)"
-            return $false
-        }
-        
-        # Create backup with .bak extension
-        $backupPath = "$FilePath.bak"
-        Copy-Item -Path $FilePath -Destination $backupPath -Force
-        
-        # Read file content
-        $content = Get-Content -Path $FilePath -Raw -ErrorAction Stop
-        
-        # Replace content
-        $updatedContent = $content.Replace($OldValue, $NewValue)
-        
-        # Write back
-        Set-Content -Path $FilePath -Value $updatedContent -Force -ErrorAction Stop
-        
-        Write-Host "Updated $FileDescription successfully."
-        return $true
-    }
-    catch {
-        Write-Error "Error updating $FileDescription: $_"
-        # Attempt to restore from backup if it exists
-        if (Test-Path $backupPath) {
-            Copy-Item -Path $backupPath -Destination $FilePath -Force
-            Write-Host "Restored $FileDescription from backup."
-        }
-        return $false
-    }
-}
-
-# Update XML settings
-if (Test-Path $file1) {
-    Write-Host "Updating VDD settings..."
-    
-    try {
-        [xml]$xmlContent = Get-Content -Path $file1 -ErrorAction Stop
-        
-        # Update XML values using proper XML methods
-        $monitorNode = $xmlContent.SelectSingleNode("//monitors/count")
-        if ($monitorNode -ne $null) {
-            $monitorNode.InnerText = "$NumMon"
-        }
-        
-        $gpuNode = $xmlContent.SelectSingleNode("//gpu/friendlyname")
-        if ($gpuNode -ne $null) {
-            $gpuNode.InnerText = "$GPUFN"
-        }
-        
-        # Save XML with proper formatting
-        $xmlContent.Save($file1)
-        Write-Host "Updated VDD settings XML successfully."
-    }
-    catch {
-        Write-Error "Error updating VDD settings XML: $_"
-        exit 1
-    }
-}
-else {
-    Write-Error "VDD settings file not found: $file1"
-    exit 1
-}
-
-# Update script paths
-$pathsUpdated = $true
-$pathsUpdated = $pathsUpdated -and (Update-FileContent -FilePath $file2 -OldValue "CmdLine=$defaultPath\scripts\toggle-VDD.ps1" -NewValue "CmdLine=$newPath\scripts\toggle-VDD.ps1" -FileDescription "psscripts.ini")
-$pathsUpdated = $pathsUpdated -and (Update-FileContent -FilePath $file3 -OldValue $defaultPath -NewValue $newPath -FileDescription "login/logoff script")
-$pathsUpdated = $pathsUpdated -and (Update-FileContent -FilePath $file4 -OldValue $defaultPath -NewValue $newPath -FileDescription "uninstall script")
-
-if (-not $pathsUpdated) {
-    Write-Warning "Some path updates may have failed. Installation might not work correctly."
-}
+# Define the replacement
+$oldPath = "CmdLine=C:\VirtualDisplayDriver\scripts\toggle-VDD.ps1"
+$newPath = "CmdLine=$InstallDir\scripts\toggle-VDD.ps1"
 
-Write-Host "Configuration completed successfully."
-exit 0
+(Get-Content $file1).replace("<friendlyname>default</friendlyname>","<friendlyname>$GPUFN</friendlyname>")| Set-Content $file1
+(Get-Content $file1).replace("<count>1</count>","<count>$NumMon</count>")  | Set-Content $file1
+(Get-Content $file2).replace($oldPath, $newPath)  | Set-Content $file2
+(Get-Content $file3).replace("C:\VirtualDisplayDriver", "$InstallDir")  | Set-Content $file3
+(Get-Content $file4).replace("C:\VirtualDisplayDriver", "$InstallDir")  | Set-Content $file4

dependencies/install.bat

@@ -7,4 +7,4 @@ nefconw.exe --remove-device-node --hardware-id Root\MttVDD --class-guid 4d36e968
 nefconw.exe --create-device-node --hardware-id Root\MttVDD --class-name Display --class-guid 4D36E968-E325-11CE-BFC1-08002BE10318
 :: encapsulate that posible space in custum folder
 nefconw.exe --install-driver --inf-path "\"%AppPath%\MttVDD.inf\"" 
-exit
+exit