2
0
Эх сурвалжийг харах

DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages -> DownloadTemporaryFileOrExtractArchiveProcessMessages.

Martijn Laan 3 сар өмнө
parent
commit
4d26869349

+ 1 - 1
Projects/Src/Compression.SevenZipDecoder.pas

@@ -271,7 +271,7 @@ begin
     end;
   end;
 
-  if not Abort and DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages then
+  if not Abort and DownloadTemporaryFileOrExtractArchiveProcessMessages then
     Application.ProcessMessages;
 
   if Abort then

+ 1 - 1
Projects/Src/Compression.SevenZipDllDecoder.pas

@@ -352,7 +352,7 @@ begin
           end;
         end;
 
-        if not Abort and DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages then
+        if not Abort and DownloadTemporaryFileOrExtractArchiveProcessMessages then
           Application.ProcessMessages;
       end);
 

+ 1 - 1
Projects/Src/Setup.Install.pas

@@ -3504,7 +3504,7 @@ begin
     end;
   end;
 
-  if not Abort and DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages then
+  if not Abort and DownloadTemporaryFileOrExtractArchiveProcessMessages then
     Application.ProcessMessages;
 
   if Abort then

+ 1 - 1
Projects/Src/Setup.MainFunc.pas

@@ -152,7 +152,7 @@ var
   DisableCodeConsts: Integer;
   SetupExitCode: Integer;
   CreatedIcon: Boolean;
-  RestartInitiatedByThisProcess, DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages: Boolean;
+  RestartInitiatedByThisProcess, DownloadTemporaryFileOrExtractArchiveProcessMessages: Boolean;
   InstallModeRootKey: HKEY;
 
   CodeRunner: TScriptRunner;

+ 2 - 2
Projects/Src/Setup.ScriptDlg.pas

@@ -1071,7 +1071,7 @@ begin
 
   Result := 0;
   for var F in FFiles do begin
-    { Don't need to set DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages before downloading since we already process messages ourselves. }
+    { Don't need to set DownloadTemporaryFileOrExtractArchiveProcessMessages before downloading since we already process messages ourselves. }
     SetDownloadCredentials(F.UserName, F.Password);
     Result := Result + DownloadTemporaryFile(F.Url, F.BaseName, F.RequiredSHA256OfFile, InternalOnDownloadProgress);
   end;
@@ -1184,7 +1184,7 @@ begin
   FAbortedByUser := False;
 
   for var A in FArchives do begin
-    { Don't need to set DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages before extraction since we already process messages ourselves. }
+    { Don't need to set DownloadTemporaryFileOrExtractArchiveProcessMessages before extraction since we already process messages ourselves. }
     Extract7ZipArchiveRedir(ScriptFuncDisableFsRedir, A.FileName, A.DestDir, A.FullPaths, InternalOnExtractionProgress);
   end;
 end;

+ 2 - 2
Projects/Src/Setup.WizardForm.pas

@@ -1844,12 +1844,12 @@ begin
       WizardForm.Visible := True;
     WizardForm.Update;
     try
-      DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages := True;
+      DownloadTemporaryFileOrExtractArchiveProcessMessages := True;
       CodeNeedsRestart := False;
       Result := CodeRunner.RunStringFunctions('PrepareToInstall', [@CodeNeedsRestart], bcNonEmpty, True, '');
       PrepareToInstallNeedsRestart := (Result <> '') and CodeNeedsRestart;
     finally
-      DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages := False;
+      DownloadTemporaryFileOrExtractArchiveProcessMessages := False;
       UpdateCurPageButtonState;
     end;
     if WindowState <> wsMinimized then  { VCL bug workaround }