Browse Source

Revert bad comment change + clarify.

Martijn Laan 1 year ago
parent
commit
2df46e7391
3 changed files with 6 additions and 6 deletions
  1. 4 4
      Projects/Src/Main.pas
  2. 1 1
      Projects/Src/RegSvr.pas
  3. 1 1
      Projects/Src/Uninstall.pas

+ 4 - 4
Projects/Src/Main.pas

@@ -197,7 +197,7 @@ function CodeRunnerOnDebugIntermediate(const Position: LongInt;
   var ContinueStepOver: Boolean): Boolean;
 procedure CodeRunnerOnDllImport(var DllName: String; var ForceDelayLoad: Boolean);
 procedure CodeRunnerOnException(const Exception: AnsiString; const Position: LongInt);
-procedure CreateTempInstallDir;
+procedure CreateTempInstallDirAndExtract64BitHelper;
 procedure DebugNotifyEntry(EntryType: TEntryType; Number: Integer);
 procedure DeinitSetup(const AllowCustomSetupExitCode: Boolean);
 function ExitSetupMsgBox: Boolean;
@@ -1447,9 +1447,9 @@ begin
   end;
 end;
 
-procedure CreateTempInstallDir;
+procedure CreateTempInstallDirAndExtract64BitHelper;
 { Initializes TempInstallDir and extracts the 64-bit helper into it if needed.
-  This is called by Setup and Uninstall. }
+  This is called by Setup, Uninstall, and RegSvr. }
 var
   Subdir, ResName, Filename: String;
   ErrorCode: DWORD;
@@ -3289,7 +3289,7 @@ begin
   InitMainNonSHFolderConsts;
 
   { Create temporary directory and extract 64-bit helper EXE if necessary }
-  CreateTempInstallDir;
+  CreateTempInstallDirAndExtract64BitHelper;
 
   { Load system's "shfolder.dll" or extract "_shfoldr.dll" to TempInstallDir, and load it }
   LoadSHFolderDLL;

+ 1 - 1
Projects/Src/RegSvr.pas

@@ -157,7 +157,7 @@ begin
 
       try
         { Extract the 64-bit helper }
-        CreateTempInstallDir;
+        CreateTempInstallDirAndExtract64BitHelper;
 
         F := TTextFileReader.Create(ListFilename, fdOpenExisting, faRead, fsRead);
         try

+ 1 - 1
Projects/Src/Uninstall.pas

@@ -565,7 +565,7 @@ begin
       Initialize64BitInstallMode(False);
 
     { Create temporary directory and extract 64-bit helper EXE if necessary }
-    CreateTempInstallDir;
+    CreateTempInstallDirAndExtract64BitHelper;
 
     if CompiledCodeText <> '' then begin
       { Setup some global variables which are accessible to [Code] }