diff --git a/builds/install/arch-specific/win32/FirebirdInstallGUIFunctions.inc b/builds/install/arch-specific/win32/FirebirdInstallGUIFunctions.inc index 37368fbff2..d98e6e0b99 100644 --- a/builds/install/arch-specific/win32/FirebirdInstallGUIFunctions.inc +++ b/builds/install/arch-specific/win32/FirebirdInstallGUIFunctions.inc @@ -30,15 +30,15 @@ o EnumerateObjectList; - Simple demonstration of object enumeration. - o Show Help - - CreateHelpDlg; - - ShowHelpDlg: Integer; - - CloseHelpDlg; - - o Show some debug info for debugging inno setup script - - CreateDebugDlg - - CloseDebugDlg; - - ShowDebugDlg + o Show Help + - CreateHelpDlg; + - ShowHelpDlg: Integer; + - CloseHelpDlg; + + o Show some debug info for debugging inno setup script + - CreateDebugDlg + - CloseDebugDlg; + - ShowDebugDlg *) @@ -49,12 +49,12 @@ var CompGroupButtonsArray: array of string; CompGroup1, CompGroup2, CompGroup3, CompGroupButtons: TStringList; -// This is a non-exhaustive list of components that need to be repositioned -// and/or resized if the form size is changed. Use EnumerateObjectList to -// get a full list of components. +// This is a non-exhaustive list of components that need to be repositioned +// and/or resized if the form size is changed. Use EnumerateObjectList to +// get a full list of components. procedure SetupWizardFormComponentsArrays; var - i, len: integer; + i: integer; begin SetArrayLength(CompGroup1Array,24); @@ -85,93 +85,93 @@ begin CompGroup1Array[23]:='OuterNotebook'; CompGroup1 := TStringList.create; - + for i := 0 to GetArrayLength( CompGroup1Array )-1 do begin - CompGroup1.add( CompGroup1Array[i] ); + CompGroup1.add( CompGroup1Array[i] ); CompGroup1.objects[i] := (WizardForm.FindComponent(CompGroup1Array[i])); end; - - SetArrayLength(CompGroup2Array,8); - CompGroup2Array[0] := 'Bevel'; - CompGroup2Array[1] := 'BeveledLabel'; - CompGroup2Array[2] := 'LicenseAcceptedRadio'; - CompGroup2Array[3] := 'LicenseNotAcceptedRadio'; - CompGroup2Array[4] := 'DiskSpaceLabel'; - CompGroup2Array[5] := 'ComponentsDiskSpaceLabel'; - CompGroup2Array[6] := 'NoIconsCheck'; - CompGroup2Array[7] := 'RunList'; + + SetArrayLength(CompGroup2Array,8); + CompGroup2Array[0] := 'Bevel'; + CompGroup2Array[1] := 'BeveledLabel'; + CompGroup2Array[2] := 'LicenseAcceptedRadio'; + CompGroup2Array[3] := 'LicenseNotAcceptedRadio'; + CompGroup2Array[4] := 'DiskSpaceLabel'; + CompGroup2Array[5] := 'ComponentsDiskSpaceLabel'; + CompGroup2Array[6] := 'NoIconsCheck'; + CompGroup2Array[7] := 'RunList'; CompGroup2 := TStringList.create; for i := 0 to GetArrayLength( CompGroup2Array )-1 do begin - CompGroup2.add(CompGroup2Array[i]); + CompGroup2.add(CompGroup2Array[i]); CompGroup2.objects[i] := (WizardForm.FindComponent(CompGroup2Array[i])); end; SetArrayLength(CompGroup3Array,1); - CompGroup3Array[0] := 'WizardBitmapImage'; + CompGroup3Array[0] := 'WizardBitmapImage'; CompGroup3 := TStringList.create; for i:=0 to GetArrayLength(CompGroup3Array)-1 do begin - CompGroup3.add(CompGroup3Array[i]); + CompGroup3.add(CompGroup3Array[i]); CompGroup3.objects[i] := (WizardForm.FindComponent(CompGroup3Array[i])); end; - SetArrayLength(CompGroupButtonsArray,3); - CompGroupButtonsArray[0] := 'BackButton'; - CompGroupButtonsArray[1] := 'NextButton'; - CompGroupButtonsArray[2] := 'CancelButton'; - CompGroupButtons := TStringList.create; + SetArrayLength(CompGroupButtonsArray,3); + CompGroupButtonsArray[0] := 'BackButton'; + CompGroupButtonsArray[1] := 'NextButton'; + CompGroupButtonsArray[2] := 'CancelButton'; + CompGroupButtons := TStringList.create; for i:=0 to GetArrayLength(CompGroupButtonsArray)-1 do begin - CompGroupButtons.add(CompGroupButtonsArray[i]); + CompGroupButtons.add(CompGroupButtonsArray[i]); CompGroupButtons.objects[i] := (WizardForm.FindComponent(CompGroupButtonsArray[i])); end; end; - + procedure ResizeWizardFormHeight(AValue: Integer); var - i: integer; + i: integer; begin wizardform.height := wizardform.height+AValue; wizardform.top := wizardform.top - (AValue div 2); // Group 1 - reset height of components - for i:=0 to GetArrayLength(CompGroup1Array)-1 do - TControl(CompGroup1.objects[i]).height := TControl(CompGroup1.objects[i]).height + Avalue; + for i:=0 to GetArrayLength(CompGroup1Array)-1 do + TControl(CompGroup1.objects[i]).height := TControl(CompGroup1.objects[i]).height + Avalue; - // Group 2 - reset top of components - for i:=0 to GetArrayLength(CompGroup2Array)-1 do - TControl(CompGroup2.objects[i]).top := TControl(CompGroup2.objects[i]).top + AValue; + // Group 2 - reset top of components + for i:=0 to GetArrayLength(CompGroup2Array)-1 do + TControl(CompGroup2.objects[i]).top := TControl(CompGroup2.objects[i]).top + AValue; // Group 3 - reset top of components but keep 'centered' vertically. - for i:=0 to GetArrayLength(CompGroup3Array)-1 do - TControl( CompGroup3.objects[i]).top := TControl(CompGroup3.objects[i]).top + (AValue div 2); - - // Group Buttons - reset top of components - for i:=0 to GetArrayLength(CompGroupButtonsArray)-1 do - TControl(CompGroupButtons.objects[i]).top := TControl(CompGroupButtons.objects[i]).top + AValue; - + for i:=0 to GetArrayLength(CompGroup3Array)-1 do + TControl( CompGroup3.objects[i]).top := TControl(CompGroup3.objects[i]).top + (AValue div 2); + + // Group Buttons - reset top of components + for i:=0 to GetArrayLength(CompGroupButtonsArray)-1 do + TControl(CompGroupButtons.objects[i]).top := TControl(CompGroupButtons.objects[i]).top + AValue; + end; // This needs more work. for now it is not used by the installer. procedure ResizeWizardFormWidth(AValue: Integer); var - i: integer; + i: integer; begin wizardform.width := wizardform.width + AValue; - wizardform.left := wizardform.left - (AValue div 2); - - // Group 1 - reset width of components - for i:=0 to GetArrayLength(CompGroup1Array)-1 do begin - TControl(CompGroup1.objects[i]).width := TControl(CompGroup1.objects[i]).width + Avalue; -// TControl(CompGroup1.objects[i]).left := TControl(CompGroup1.objects[i]).left + (Avalue div 2); - end; + wizardform.left := wizardform.left - (AValue div 2); - // Group 2 - reset left of components - for i:=0 to GetArrayLength(CompGroup2Array)-1 do begin - TControl(CompGroup2.objects[i]).left := TControl(CompGroup2.objects[i]).left + AValue; - TControl(CompGroup2.objects[i]).width := TControl(CompGroup2.objects[i]).width + (AValue div 2); - end; + // Group 1 - reset width of components + for i:=0 to GetArrayLength(CompGroup1Array)-1 do begin + TControl(CompGroup1.objects[i]).width := TControl(CompGroup1.objects[i]).width + Avalue; +// TControl(CompGroup1.objects[i]).left := TControl(CompGroup1.objects[i]).left + (Avalue div 2); + end; + + // Group 2 - reset left of components + for i:=0 to GetArrayLength(CompGroup2Array)-1 do begin + TControl(CompGroup2.objects[i]).left := TControl(CompGroup2.objects[i]).left + AValue; + TControl(CompGroup2.objects[i]).width := TControl(CompGroup2.objects[i]).width + (AValue div 2); + end; // Group 3 - reset left of components but keep 'centered' horizontally. // for i:=0 to GetArrayLength(CompGroup3Array)-1 do @@ -210,7 +210,7 @@ procedure EnumerateObjectList; //Walk through the components on the InnoSetup install wizard var Alist: TStringList; - i, j: integer; + i: integer; aComponent: string; begin @@ -284,20 +284,20 @@ end; function ShowHelpDlg: Integer; begin - CreateHelpDlg; + CreateHelpDlg; result := HelpDlg.ShowModal; - CloseHelpDlg; + CloseHelpDlg; end; // Add a simple debug dialogue -var - DebugDlg: TForm; - +var + DebugDlg: TForm; + procedure CreateDebugDlg(aString: String; ADescription: String); var DebugText: TMemo; - DebugDescription: TLabel; +// DebugDescription: TLabel; OKButton: TButton; begin DebugDlg := TForm.create(nil); @@ -328,8 +328,8 @@ begin DebugDlg.ActiveControl := OKButton; end; - - + + procedure CloseDebugDlg; begin with DebugDlg do begin @@ -341,8 +341,8 @@ end; function ShowDebugDlg(aString: String; aDescription: String): Integer; begin - CreateDebugDlg(aString,aDescription); + CreateDebugDlg(aString,aDescription); result := DebugDlg.ShowModal; - CloseDebugDlg; + CloseDebugDlg; end; diff --git a/builds/install/arch-specific/win32/FirebirdInstallSupportFunctions.inc b/builds/install/arch-specific/win32/FirebirdInstallSupportFunctions.inc index c95696f340..f1ccbecb1a 100644 --- a/builds/install/arch-specific/win32/FirebirdInstallSupportFunctions.inc +++ b/builds/install/arch-specific/win32/FirebirdInstallSupportFunctions.inc @@ -27,15 +27,15 @@ Function Prototypes function IsWin32: boolean; function Is32BitInstallMode: boolean; - function IsWinTen: boolean; - function IsWinEightOne: boolean; - function IsWinEight: boolean; - function IsW2K12: boolean; + function IsWinTen: boolean; + function IsWinEightOne: boolean; + function IsWinEight: boolean; + function IsW2K12: boolean; function IsVista: boolean; - function IsVistaSP1: boolean; - function IsWin2K8R1: boolean; - function IsWinSeven: boolean; - function IsWin2K8R2: boolean; + function IsVistaSP1: boolean; + function IsWin2K8R1: boolean; + function IsWinSeven: boolean; + function IsWin2K8R2: boolean; function IsWin2k3: boolean; function IsWinXP: boolean; function IsWin2K: boolean; @@ -53,7 +53,7 @@ Function Prototypes function GetInstalledVersion(BinaryFile: String): Array of Integer; function ConvertIBVerStrToFbVerStr( VerStr: String) : String; function GetRegistryEntry(RegKey, RegEntry: string): String; - + *) (* @@ -68,21 +68,21 @@ InnoSetup Help Extract on Windows version strings: Windows NT versions: 4.0.1381 Windows NT 4.0 5.0.2195 Windows 2000 -5.01.2600 Windows XP - or Windows XP 64-Bit Edition Version 2002 (Itanium) -5.02.3790 Windows Server 2003 - or Windows XP x64 Edition (AMD64/EM64T) - or Windows XP 64-Bit Edition Version 2003 (Itanium) -6.0.6000 Windows Vista -6.0.6001 Windows Vista with Service Pack 1 - or Windows Server 2008 -6.0.6002 Windows Vista with Service Pack 2 -6.1.7600 Windows 7 - or Windows Server 2008 R2 -6.2.9200 Windows 8 or Windows Server 2012 -6.3.9200 Windows 8.1 or Windows Server 2012 R2 -6.3.9600 Windows 8.1 with Update 1 -10.0.10240 Windows 10 +5.01.2600 Windows XP + or Windows XP 64-Bit Edition Version 2002 (Itanium) +5.02.3790 Windows Server 2003 + or Windows XP x64 Edition (AMD64/EM64T) + or Windows XP 64-Bit Edition Version 2003 (Itanium) +6.0.6000 Windows Vista +6.0.6001 Windows Vista with Service Pack 1 + or Windows Server 2008 +6.0.6002 Windows Vista with Service Pack 2 +6.1.7600 Windows 7 + or Windows Server 2008 R2 +6.2.9200 Windows 8 or Windows Server 2012 +6.3.9200 Windows 8.1 or Windows Server 2012 R2 +6.3.9600 Windows 8.1 with Update 1 +10.0.10240 Windows 10 *)