Improved library registration

Author: mzagozda

Installer/setup.iss

@@ -55,9 +55,9 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip
 Source: "{#SourcePath}\salamand.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#SourcePath}\salmon.exe"; DestDir: "{app}"; Flags: ignoreversion
 
-; Shell extensions
-Source: "{#SourcePath}\salextx64.dll"; DestDir: "{app}"; Flags: ignoreversion regserver 64bit
-Source: "{#SourcePath}\salextx86.dll"; DestDir: "{app}"; Flags: ignoreversion regserver 32bit
+; Shell extensions live under utils and are registered by Salamander on first run.
+Source: "{#SourcePath}\utils\salextx64.dll"; DestDir: "{app}\utils"; Flags: ignoreversion
+Source: "{#SourcePath}\utils\salextx86.dll"; DestDir: "{app}\utils"; Flags: ignoreversion
 
 ; Utility executables (optional - only if present)
 Source: "{#SourcePath}\salopen.exe"; DestDir: "{app}"; Flags: ignoreversion skipifsourcedoesntexist

tools/prepare_installer.ps1

@@ -53,9 +53,9 @@ $salmonCopied = Copy-Exe @("$BuildDir\Release_x64\salmon.exe", "src\vcxproj\salm
 if (-not $salamandCopied) { Write-Error "Could not find salamand.exe" }
 if (-not $salmonCopied) { Write-Error "Could not find salmon.exe" }
 
-# Shell extensions
-Copy-Exe @("$BuildDir\Release_x64\salextx64.dll", "$BuildDir\shellext\Release_x64\salextx64.dll", "src\vcxproj\shellext\salamander\Release_x64\plugins\Intermediate\salextx64\salextx64.dll", "src\vcxproj\shellext\salamander\Release_x64\salextx64.dll") "salextx64.dll" "$StagingDir\"
-Copy-Exe @("$BuildDir\Release_Win32\salextx86.dll", "$BuildDir\shellext\Release_Win32\salextx86.dll", "$BuildDir\Release_x64\salextx86.dll", "src\vcxproj\shellext\salamander\Release_x86\plugins\Intermediate\salextx86\salextx86.dll", "src\vcxproj\shellext\salamander\Release_x86\salextx86.dll") "salextx86.dll" "$StagingDir\"
+# Shell extensions are installed from the utils directory and registered by Salamander itself.
+Copy-Exe @("$BuildDir\Release_x64\salextx64.dll", "$BuildDir\shellext\Release_x64\salextx64.dll", "src\vcxproj\shellext\salamander\Release_x64\plugins\Intermediate\salextx64\salextx64.dll", "src\vcxproj\shellext\salamander\Release_x64\salextx64.dll") "salextx64.dll" "$StagingDir\utils\"
+Copy-Exe @("$BuildDir\Release_Win32\salextx86.dll", "$BuildDir\shellext\Release_Win32\salextx86.dll", "$BuildDir\Release_x64\salextx86.dll", "src\vcxproj\shellext\salamander\Release_x86\plugins\Intermediate\salextx86\salextx86.dll", "src\vcxproj\shellext\salamander\Release_x86\salextx86.dll") "salextx86.dll" "$StagingDir\utils\"
 
 # Utils (Note: salpvenv.exe excluded - depends on proprietary PVW32Cnv.lib)
 Copy-Exe @("$BuildDir\Release_x64\salopen.exe") "salopen.exe" "$StagingDir\"