1616var
1717 Dependency_Memo: String;
1818 Dependency_List: array of TDependency_Entry;
19- Dependency_NeedRestart , Dependency_ForceX86: Boolean;
19+ Dependency_NeedToRestart , Dependency_ForceX86: Boolean;
2020 Dependency_DownloadPage: TDownloadWizardPage;
2121
2222procedure Dependency_Add (const Filename, Parameters, Title, URL, Checksum: String; const ForceSuccess, RestartAfter: Boolean);
@@ -46,13 +46,13 @@ begin
4646end ;
4747
4848<event(' InitializeWizard' )>
49- procedure Dependency_Internal1 ;
49+ procedure Dependency_InitializeWizard ;
5050begin
5151 Dependency_DownloadPage := CreateDownloadPage(SetupMessage(msgWizardPreparing), SetupMessage(msgPreparingDesc), nil );
5252end ;
5353
5454<event(' PrepareToInstall' )>
55- function Dependency_Internal2 (var NeedsRestart: Boolean): String;
55+ function Dependency_PrepareToInstall (var NeedsRestart: Boolean): String;
5656var
5757 DependencyCount, DependencyIndex, ResultCode: Integer;
5858 Retry: Boolean;
@@ -104,7 +104,7 @@ begin
104104 if ShellExec(' ' , ExpandConstant(' {tmp}{\}' ) + Dependency_List[DependencyIndex].Filename, Dependency_List[DependencyIndex].Parameters, ' ' , SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode) then begin
105105 if Dependency_List[DependencyIndex].RestartAfter then begin
106106 if DependencyIndex = DependencyCount - 1 then begin
107- Dependency_NeedRestart := True;
107+ Dependency_NeedToRestart := True;
108108 end else begin
109109 NeedsRestart := True;
110110 Result := Dependency_List[DependencyIndex].Title;
@@ -117,7 +117,7 @@ begin
117117 Result := Dependency_List[DependencyIndex].Title;
118118 break;
119119 end else if ResultCode = 3010 then begin // ERROR_SUCCESS_REBOOT_REQUIRED (3010)
120- Dependency_NeedRestart := True;
120+ Dependency_NeedToRestart := True;
121121 break;
122122 end ;
123123 end ;
@@ -151,8 +151,10 @@ begin
151151 end ;
152152end ;
153153
154+ #ifndef Dependency_NoUpdateReadyMemo
154155<event(' UpdateReadyMemo' )>
155- function Dependency_Internal3 (const Space, NewLine, MemoUserInfoInfo, MemoDirInfo, MemoTypeInfo, MemoComponentsInfo, MemoGroupInfo, MemoTasksInfo: String): String;
156+ #endif
157+ function Dependency_UpdateReadyMemo (const Space, NewLine, MemoUserInfoInfo, MemoDirInfo, MemoTypeInfo, MemoComponentsInfo, MemoGroupInfo, MemoTasksInfo: String): String;
156158begin
157159 Result := ' ' ;
158160 if MemoUserInfoInfo <> ' ' then begin
@@ -183,9 +185,9 @@ begin
183185end ;
184186
185187<event(' NeedRestart' )>
186- function Dependency_Internal4 : Boolean;
188+ function Dependency_NeedRestart : Boolean;
187189begin
188- Result := Dependency_NeedRestart ;
190+ Result := Dependency_NeedToRestart ;
189191end ;
190192
191193function Dependency_IsX64 : Boolean;
0 commit comments