|
@@ -35,7 +35,6 @@ type
|
|
|
|
|
|
var
|
|
var
|
|
CurProgress: Integer64;
|
|
CurProgress: Integer64;
|
|
- CurInstallStep: TInstallStep;
|
|
|
|
ProgressShiftCount: Cardinal;
|
|
ProgressShiftCount: Cardinal;
|
|
|
|
|
|
{ TSetupUninstallLog }
|
|
{ TSetupUninstallLog }
|
|
@@ -137,7 +136,7 @@ begin
|
|
if (CodeRunner <> nil) and CodeRunner.FunctionExists('CurInstallProgressChanged') then begin
|
|
if (CodeRunner <> nil) and CodeRunner.FunctionExists('CurInstallProgressChanged') then begin
|
|
try
|
|
try
|
|
CodeRunner.RunProcedure('CurInstallProgressChanged', [NewPosition.Lo,
|
|
CodeRunner.RunProcedure('CurInstallProgressChanged', [NewPosition.Lo,
|
|
- WizardForm.ProgressGauge.Max, Ord(CurInstallStep)], False);
|
|
|
|
|
|
+ WizardForm.ProgressGauge.Max], False);
|
|
except
|
|
except
|
|
Log('CurInstallProgressChanged raised an exception.');
|
|
Log('CurInstallProgressChanged raised an exception.');
|
|
Application.HandleException(nil);
|
|
Application.HandleException(nil);
|
|
@@ -173,11 +172,6 @@ begin
|
|
UpdateProgressGauge;
|
|
UpdateProgressGauge;
|
|
end;
|
|
end;
|
|
|
|
|
|
-procedure SetInstallStep(const InstallStep: TInstallStep);
|
|
|
|
-begin
|
|
|
|
- CurInstallStep := InstallStep;
|
|
|
|
-end;
|
|
|
|
-
|
|
|
|
procedure ProcessEvents;
|
|
procedure ProcessEvents;
|
|
{ Processes any waiting events. Must call this this periodically or else
|
|
{ Processes any waiting events. Must call this this periodically or else
|
|
events like clicking the Cancel button won't be processed.
|
|
events like clicking the Cancel button won't be processed.
|
|
@@ -2875,14 +2869,12 @@ begin
|
|
end;
|
|
end;
|
|
|
|
|
|
{ Copy the files }
|
|
{ Copy the files }
|
|
- SetInstallStep(isExtractFiles);
|
|
|
|
SetStatusLabelText(SetupMessages[msgStatusExtractFiles]);
|
|
SetStatusLabelText(SetupMessages[msgStatusExtractFiles]);
|
|
CopyFiles(Uninstallable);
|
|
CopyFiles(Uninstallable);
|
|
ProcessEvents;
|
|
ProcessEvents;
|
|
|
|
|
|
{ Create program icons, if any }
|
|
{ Create program icons, if any }
|
|
if HasIcons then begin
|
|
if HasIcons then begin
|
|
- SetInstallStep(isCreateIcons);
|
|
|
|
SetStatusLabelText(SetupMessages[msgStatusCreateIcons]);
|
|
SetStatusLabelText(SetupMessages[msgStatusCreateIcons]);
|
|
CreateIcons;
|
|
CreateIcons;
|
|
ProcessEvents;
|
|
ProcessEvents;
|
|
@@ -2890,7 +2882,6 @@ begin
|
|
|
|
|
|
{ Create INI entries, if any }
|
|
{ Create INI entries, if any }
|
|
if Entries[seIni].Count <> 0 then begin
|
|
if Entries[seIni].Count <> 0 then begin
|
|
- SetInstallStep(isCreateIniEntries);
|
|
|
|
SetStatusLabelText(SetupMessages[msgStatusCreateIniEntries]);
|
|
SetStatusLabelText(SetupMessages[msgStatusCreateIniEntries]);
|
|
CreateIniEntries;
|
|
CreateIniEntries;
|
|
ProcessEvents;
|
|
ProcessEvents;
|
|
@@ -2898,7 +2889,6 @@ begin
|
|
|
|
|
|
{ Create registry entries, if any }
|
|
{ Create registry entries, if any }
|
|
if Entries[seRegistry].Count <> 0 then begin
|
|
if Entries[seRegistry].Count <> 0 then begin
|
|
- SetInstallStep(isCreateRegistryEntries);
|
|
|
|
SetStatusLabelText(SetupMessages[msgStatusCreateRegistryEntries]);
|
|
SetStatusLabelText(SetupMessages[msgStatusCreateRegistryEntries]);
|
|
CreateRegistryEntries;
|
|
CreateRegistryEntries;
|
|
ProcessEvents;
|
|
ProcessEvents;
|