forked from jrsoftware/issrc
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make the iscrypt download optional via the wizard instead of requirin…
…g a command line parameter. To avoid unexpected downloads the option is disabled by default. It still doesnt redownload if iscrypt.dll is already present (unlike ISPack did).
- Loading branch information
1 parent
e8540f8
commit fed0153
Showing
4 changed files
with
168 additions
and
35 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,163 @@ | ||
| // -- IsCrypt.iss -- | ||
| // Include file with support functions to download encryption support | ||
| // Must be included before adding [Files] entries | ||
| // | ||
| [Files] | ||
| Source: "iscrypt.ico"; Flags: dontcopy | ||
| Source: "{tmp}\ISCrypt.dll"; DestDir: "{app}"; Flags: ignoreversion external skipifsourcedoesntexist touch | ||
|
|
||
| [Code] | ||
| const | ||
| ISCryptHash = '2f6294f9aa09f59a574b5dcd33be54e16b39377984f3d5658cda44950fa0f8fc'; | ||
| var | ||
| ISCryptPage: TWizardPage; | ||
| ISCryptCheckBox: TCheckBox; | ||
| function GetModuleHandle(lpModuleName: LongInt): LongInt; | ||
| external '[email protected] stdcall'; | ||
| function ExtractIcon(hInst: LongInt; lpszExeFileName: String; nIconIndex: LongInt): LongInt; | ||
| external '[email protected] stdcall'; | ||
| function DrawIconEx(hdc: LongInt; xLeft, yTop: Integer; hIcon: LongInt; cxWidth, cyWidth: Integer; istepIfAniCur: LongInt; hbrFlickerFreeDraw, diFlags: LongInt): LongInt; | ||
| external '[email protected] stdcall'; | ||
| function DestroyIcon(hIcon: LongInt): LongInt; | ||
| external '[email protected] stdcall'; | ||
| const | ||
| DI_NORMAL = 3; | ||
| procedure CreateCustomOption(Page: TWizardPage; ACheckCaption: String; var CheckBox: TCheckBox; PreviousControl: TControl); | ||
| begin | ||
| CheckBox := TCheckBox.Create(Page); | ||
| with CheckBox do begin | ||
| Top := PreviousControl.Top + PreviousControl.Height + ScaleY(12); | ||
| Width := Page.SurfaceWidth; | ||
| Height := ScaleY(Height); | ||
| Anchors := [akLeft, akTop, akRight]; | ||
| Caption := ACheckCaption; | ||
| Parent := Page.Surface; | ||
| end; | ||
| end; | ||
| function CreateCustomOptionPage(AAfterId: Integer; ACaption, ASubCaption, AIconFileName, ALabel1Caption, ALabel2Caption, | ||
| ACheckCaption: String; var CheckBox: TCheckBox): TWizardPage; | ||
| var | ||
| Page: TWizardPage; | ||
| Rect: TRect; | ||
| hIcon: LongInt; | ||
| Label1, Label2: TNewStaticText; | ||
| begin | ||
| Page := CreateCustomPage(AAfterID, ACaption, ASubCaption); | ||
| try | ||
| AIconFileName := ExpandConstant('{tmp}\' + AIconFileName); | ||
| if not FileExists(AIconFileName) then | ||
| ExtractTemporaryFile(ExtractFileName(AIconFileName)); | ||
| Rect.Left := 0; | ||
| Rect.Top := 0; | ||
| Rect.Right := 32; | ||
| Rect.Bottom := 32; | ||
| hIcon := ExtractIcon(GetModuleHandle(0), AIconFileName, 0); | ||
| try | ||
| with TBitmapImage.Create(Page) do begin | ||
| with Bitmap do begin | ||
| Width := 32; | ||
| Height := 32; | ||
| Canvas.Brush.Color := Page.SurfaceColor; | ||
| Canvas.FillRect(Rect); | ||
| DrawIconEx(Canvas.Handle, 0, 0, hIcon, 32, 32, 0, 0, DI_NORMAL); | ||
| end; | ||
| Width := Bitmap.Width; | ||
| Height := Bitmap.Width; | ||
| Parent := Page.Surface; | ||
| end; | ||
| finally | ||
| DestroyIcon(hIcon); | ||
| end; | ||
| except | ||
| end; | ||
| Label1 := TNewStaticText.Create(Page); | ||
| with Label1 do begin | ||
| AutoSize := False; | ||
| Left := WizardForm.SelectDirLabel.Left; | ||
| Width := Page.SurfaceWidth - Left; | ||
| Anchors := [akLeft, akTop, akRight]; | ||
| WordWrap := True; | ||
| Caption := ALabel1Caption; | ||
| Parent := Page.Surface; | ||
| end; | ||
| WizardForm.AdjustLabelHeight(Label1); | ||
| Label2 := TNewStaticText.Create(Page); | ||
| with Label2 do begin | ||
| Top := Label1.Top + Label1.Height + ScaleY(12); | ||
| Width := Page.SurfaceWidth; | ||
| Anchors := [akLeft, akTop, akRight]; | ||
| WordWrap := True; | ||
| Caption := ALabel2Caption; | ||
| Parent := Page.Surface; | ||
| end; | ||
| WizardForm.AdjustLabelHeight(Label2); | ||
| CreateCustomOption(Page, ACheckCaption, CheckBox, Label2); | ||
| Result := Page; | ||
| end; | ||
| <event('InitializeWizard')> | ||
| procedure IsCryptInitializeWizard; | ||
| var | ||
| ExistingFileName, Caption, SubCaption1, IconFileName, Label1Caption, Label2Caption, CheckCaption: String; | ||
| begin | ||
| if WizardForm.PrevAppDir <> '' then begin | ||
| ExistingFileName := AddBackslash(WizardForm.PrevAppDir) + 'ISCrypt.dll'; | ||
| try | ||
| if GetSHA256OfFile(ExistingFileName) = ISCryptHash then | ||
| Exit; | ||
| except | ||
| end; | ||
| end; | ||
| Caption := 'Encryption Support'; | ||
| SubCaption1 := 'Would you like to download encryption support?'; | ||
| IconFileName := 'iscrypt.ico'; | ||
| Label1Caption := | ||
| 'Inno Setup supports encryption. However, because of encryption import/export laws in some countries, encryption support is not included in the main' + | ||
| ' Inno Setup installer. Instead, it can be downloaded from a server located in the Netherlands now.'; | ||
| Label2Caption := 'Select whether you would like to download and install encryption support, then click Next.'; | ||
| CheckCaption := '&Download and install encryption support'; | ||
| ISCryptPage := CreateCustomOptionPage(wpSelectProgramGroup, Caption, SubCaption1, IconFileName, Label1Caption, Label2Caption, CheckCaption, ISCryptCheckBox); | ||
| ISCryptCheckBox.Checked := ExpandConstant('{param:downloadiscrypt|0}') = '1'; | ||
| end; | ||
| <event('NextButtonClick')> | ||
| function IsCryptNextButtonClick(CurPageID: Integer): Boolean; | ||
| var | ||
| DownloadPage: TDownloadWizardPage; | ||
| begin | ||
| Result := True; | ||
| if (CurPageID = wpReady) and (ISCryptCheckBox <> nil) and ISCryptCheckBox.Checked then begin | ||
| if DownloadPage = nil then | ||
| DownloadPage := CreateDownloadPage(SetupMessage(msgWizardPreparing), SetupMessage(msgPreparingDesc), nil); | ||
| DownloadPage.Clear; | ||
| DownloadPage.Add('https://jrsoftware.org/download.php/iscrypt.dll', 'ISCrypt.dll', ISCryptHash); | ||
| DownloadPage.Show; | ||
| try | ||
| try | ||
| DownloadPage.Download; | ||
| except | ||
| if DownloadPage.AbortedByUser then | ||
| Log('Aborted by user.') | ||
| else | ||
| SuppressibleMsgBox(AddPeriod(GetExceptionMessage), mbCriticalError, MB_OK, IDOK); | ||
| end; | ||
| finally | ||
| DownloadPage.Hide; | ||
| end; | ||
| end; | ||
| end; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters