Improved the Setup executable

Author: unalignedcoder

CalibreImport/InnoSetup/CalibreImportSetup-NoPortable.iss

@@ -1,22 +1,25 @@
 #define ReleaseFilesPath "..\ReleaseFiles\"
 #define AppName "CalibreImport"
+#define MainDll "CalibreImport.dll"
 
 [Setup]
 AppName={#AppName}
 AppVersion=1.0
 DefaultDirName={pf}\{#AppName}
 DefaultGroupName={#AppName}
-UninstallDisplayIcon={app}\{#AppName}.dll
+UninstallDisplayIcon={app}\{#MainDll}
 OutputDir={#ReleaseFilesPath}
 OutputBaseFilename=CalibreImportSetup
 Compression=lzma
 SolidCompression=yes
 PrivilegesRequired=admin
+ArchitecturesAllowed=x64
+ArchitecturesInstallIn64BitMode=x64
 
 [Files]
-; Install all DLLs to application directory
-Source: "{#ReleaseFilesPath}*.dll"; DestDir: "{app}"; Flags: ignoreversion
-; Install config file to AppData
+; Install all files (x64)
+Source: "{#ReleaseFilesPath}*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode
+; Config file goes to AppData
 Source: "{#ReleaseFilesPath}*.config"; DestDir: "{userappdata}\{#AppName}"; Flags: ignoreversion
 
 [Code]
@@ -34,40 +37,57 @@ begin
   end;
 end;
 
-procedure RegisterDLLs;
+function RegisterMainDLL: Boolean;
 var
-  FindRec: TFindRec;
   RegAsmPath: String;
   ResultCode: Integer;
 begin
-  RegAsmPath := ExpandConstant('{win}\Microsoft.NET\Framework\v4.0.30319\regasm.exe');
+  Result := False;
+  
+  // Use 64-bit regasm explicitly
+  RegAsmPath := ExpandConstant('{win}\Microsoft.NET\Framework64\v4.0.30319\regasm.exe');
+  
   if not FileExists(RegAsmPath) then
-    RegAsmPath := ExpandConstant('{win}\Microsoft.NET\Framework64\v4.0.30319\regasm.exe');
+  begin
+    MsgBox('64-bit .NET Framework 4.8 not found. Please install it first.', mbError, MB_OK);
+    Exit;
+  end;
 
-  if FindFirst(ExpandConstant('{app}\*.dll'), FindRec) then
+  Log('Attempting to register 64-bit DLL with: ' + RegAsmPath);
+  
+  if Exec(RegAsmPath, ExpandConstant('"{app}\{#MainDll}" /codebase'), '', 
+     SW_HIDE, ewWaitUntilTerminated, ResultCode) then
   begin
-    try
-      repeat
-        if (FindRec.Name <> '.') and (FindRec.Name <> '..') then
-        begin
-          if not Exec(RegAsmPath, ExpandConstant('"{app}\' + FindRec.Name + '" /codebase'), '', 
-             SW_HIDE, ewWaitUntilTerminated, ResultCode) then
-            MsgBox('Failed to register ' + FindRec.Name + ': ' + SysErrorMessage(ResultCode), mbError, MB_OK)
-          else if ResultCode <> 0 then
-            MsgBox('Registration failed for ' + FindRec.Name + ' with code: ' + IntToStr(ResultCode), mbError, MB_OK);
-        end;
-      until not FindNext(FindRec);
-    finally
-      FindClose(FindRec);
+    if ResultCode = 0 then
+    begin
+      Result := True;
+      Log('64-bit DLL registration succeeded');
+    end
+    else
+    begin
+      Log('Registration failed with code: ' + IntToStr(ResultCode));
+      MsgBox('Registration failed (Code ' + IntToStr(ResultCode) + '). ' +
+             'Make sure this is a 64-bit .NET assembly and all dependencies are installed.', 
+             mbError, MB_OK);
     end;
+  end
+  else
+  begin
+    Log('Failed to execute regasm: ' + SysErrorMessage(ResultCode));
   end;
 end;
 
 procedure InitializeWizard;
 begin
+  if not Is64BitInstallMode then
+  begin
+    MsgBox('This application requires a 64-bit Windows system.', mbError, MB_OK);
+    Abort;
+  end;
+
   if not IsDotNet48Installed then
   begin
-    MsgBox('This application requires .NET Framework 4.8. Please install it and then run this setup again.', mbError, MB_OK);
+    MsgBox('This application requires 64-bit .NET Framework 4.8. Please install it first.', mbError, MB_OK);
     Abort;
   end;
 end;
@@ -76,6 +96,13 @@ procedure CurStepChanged(CurStep: TSetupStep);
 begin
   if CurStep = ssPostInstall then
   begin
-    RegisterDLLs;
+    if not RegisterMainDLL then
+    begin
+      MsgBox('For manual registration, run as Administrator:' + #13#10#13#10 +
+             '"%windir%\Microsoft.NET\Framework64\v4.0.30319\regasm.exe" "' + 
+             ExpandConstant('{app}\{#MainDll}') + '" /codebase' + #13#10#13#10 +
+             'Check the log file for details: ' + ExpandConstant('{log}'),
+             mbError, MB_OK);
+    end;
   end;
 end;