Skip to content

Commit 5c9163f

Browse files
author
Markus Humm
committed
Merge branch '6.2.1_Bugfixrelease_for_6.2' into master
2 parents c9c1d65 + 61ffefc commit 5c9163f

15 files changed

+325
-351
lines changed

‎Demos/Cipher_FMX/Cipher_FMX.dproj‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,8 @@
205205
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
206206
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
207207
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
208-
<DCC_UsePackage>DBXSqliteDriver;RESTComponents;DataSnapServerMidas;DBXDb2Driver;DBXInterBaseDriver;TwoThumbTrackbarDesign;vclactnband;vclFireDAC;emsclientfiredac;DataSnapFireDAC;svnui;tethering;JvGlobus;FireDACADSDriver;JvPluginSystem;DBXMSSQLDriver;JvMM;DatasnapConnectorsFreePascal;FireDACMSSQLDriver;vcltouch;JvBands;vcldb;bindcompfmx;svn;Intraweb;DBXOracleDriver;JvJans;JvNet;inetdb;JvAppFrm;VirtualTreesDR;FmxTeeUI;emsedge;JvDotNetCtrls;FireDACIBDriver;fmx;fmxdae;TwoThumbTrackbarRuntime;JvWizards;IcsCommonD101Run;FireDACDBXDriver;dbexpress;IndyCore;vclx;JvPageComps;dsnap;DataSnapCommon;emsclient;IcsVclD101Run;FireDACCommon;fmxinfopower;JvDB;RESTBackendComponents;DataSnapConnectors;VCLRESTComponents;soapserver;JclDeveloperTools;vclie;RDesignLAB;bindengine;DBXMySQLDriver;FireDACOracleDriver;CloudService;FireDACMySQLDriver;DBXFirebirdDriver;JvCmp;JvHMI;FireDACCommonODBC;FireDACCommonDriver;DataSnapClient;inet;bindcompdbx;IndyIPCommon;JvCustom;vcl;DBXSybaseASEDriver;IndyIPServer;JvXPCtrls;IndySystem;FireDACDb2Driver;dsnapcon;FireDACMSAccDriver;fmxFireDAC;FireDACInfxDriver;vclimg;TeeDB;FireDAC;Jcl;JvCore;emshosting;IcsFmxD101Run;JvCrypt;FireDACSqliteDriver;FireDACPgDriver;FireDACASADriver;DBXOdbcDriver;FireDACTDataDriver;FMXTee;soaprtl;DbxCommonDriver;JvDlgs;JvRuntimeDesign;JvManagedThreads;Tee;DataSnapServer;xmlrtl;soapmidas;DataSnapNativeClient;fmxobj;vclwinx;FireDACDSDriver;rtl;JvTimeFramework;DbxClientDriver;DBXSybaseASADriver;CustomIPTransport;vcldsnap;CodeSiteExpressPkg;DOSCommandDR;JvSystem;JvStdCtrls;TMSFMXPackPkgDXE10;bindcomp;appanalytics;DBXInformixDriver;IndyIPClient;bindcompvcl;TeeUI;JvDocking;dbxcds;VclSmp;JvPascalInterpreter;adortl;FireDACODBCDriver;JclVcl;DataSnapIndy10ServerTransport;dsnapxml;DataSnapProviderClient;dbrtl;inetdbxpress;FireDACMongoDBDriver;IndyProtocols;JvControls;JvPrintPreview;TMSFMXPackPkgDEDXE10;JclContainers;PowerPDFDR;fmxase;$(DCC_UsePackage)</DCC_UsePackage>
209208
<VerInfo_Locale>1033</VerInfo_Locale>
210209
<BT_BuildType>Debug</BT_BuildType>
211-
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
212210
<VerInfo_MinorVer>2</VerInfo_MinorVer>
213211
</PropertyGroup>
214212
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
@@ -299,12 +297,22 @@
299297
<Overwrite>true</Overwrite>
300298
</Platform>
301299
</DeployFile>
300+
<DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Android__Demos\AndroidManifest.xml" Configuration="Debug" Class="ProjectAndroidManifest">
301+
<Platform Name="Android">
302+
<Overwrite>true</Overwrite>
303+
</Platform>
304+
</DeployFile>
302305
<DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Android64__Demos\classes.dex" Configuration="Release" Class="AndroidClassesDexFile">
303306
<Platform Name="Android64">
304307
<RemoteName>classes.dex</RemoteName>
305308
<Overwrite>true</Overwrite>
306309
</Platform>
307310
</DeployFile>
311+
<DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Android__Demos\styles.xml" Configuration="Debug" Class="AndroidSplashStyles">
312+
<Platform Name="Android">
313+
<Overwrite>true</Overwrite>
314+
</Platform>
315+
</DeployFile>
308316
<DeployFile LocalName="Crypto_960_720.png" Configuration="Release" Class="Android_SplashImage960">
309317
<Platform Name="Android64">
310318
<RemoteName>splash_image.png</RemoteName>
@@ -346,7 +354,13 @@
346354
<Overwrite>true</Overwrite>
347355
</Platform>
348356
</DeployFile>
349-
<DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Android__Demos\splash_image_def.xml" Configuration="Debug" Class="AndroidSplashImageDef">
357+
<DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Android__Demos\libCipher_FMX.so" Configuration="Debug" Class="ProjectOutput">
358+
<Platform Name="Android">
359+
<RemoteName>libCipher_FMX.so</RemoteName>
360+
<Overwrite>true</Overwrite>
361+
</Platform>
362+
</DeployFile>
363+
<DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Android__Demos\strings.xml" Configuration="Debug" Class="Android_Strings">
350364
<Platform Name="Android">
351365
<Overwrite>true</Overwrite>
352366
</Platform>
@@ -369,22 +383,12 @@
369383
<Overwrite>true</Overwrite>
370384
</Platform>
371385
</DeployFile>
372-
<DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Android__Demos\strings.xml" Configuration="Debug" Class="Android_Strings">
373-
<Platform Name="Android">
374-
<Overwrite>true</Overwrite>
375-
</Platform>
376-
</DeployFile>
377386
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_96x96.png" Configuration="Debug" Class="Android_NotificationIcon96">
378387
<Platform Name="Android">
379388
<RemoteName>ic_notification.png</RemoteName>
380389
<Overwrite>true</Overwrite>
381390
</Platform>
382391
</DeployFile>
383-
<DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Android__Demos\AndroidManifest.xml" Configuration="Debug" Class="ProjectAndroidManifest">
384-
<Platform Name="Android">
385-
<Overwrite>true</Overwrite>
386-
</Platform>
387-
</DeployFile>
388392
<DeployFile LocalName="$(BDS)\lib\android\debug\armeabi\libnative-activity.so" Configuration="Debug" Class="AndroidLibnativeArmeabiFile">
389393
<Platform Name="Android">
390394
<RemoteName>libCipher_FMX.so</RemoteName>
@@ -505,12 +509,6 @@
505509
<Overwrite>true</Overwrite>
506510
</Platform>
507511
</DeployFile>
508-
<DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Android__Demos\libCipher_FMX.so" Configuration="Debug" Class="ProjectOutput">
509-
<Platform Name="Android">
510-
<RemoteName>libCipher_FMX.so</RemoteName>
511-
<Overwrite>true</Overwrite>
512-
</Platform>
513-
</DeployFile>
514512
<DeployFile LocalName="CryptoIcon_72.png" Configuration="Release" Class="Android_LauncherIcon72">
515513
<Platform Name="Android64">
516514
<RemoteName>ic_launcher.png</RemoteName>
@@ -539,11 +537,6 @@
539537
<Overwrite>true</Overwrite>
540538
</Platform>
541539
</DeployFile>
542-
<DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Android__Demos\styles.xml" Configuration="Debug" Class="AndroidSplashStyles">
543-
<Platform Name="Android">
544-
<Overwrite>true</Overwrite>
545-
</Platform>
546-
</DeployFile>
547540
<DeployFile LocalName="Crypto_960_720.png" Configuration="Debug" Class="Android_SplashImage960">
548541
<Platform Name="Android">
549542
<RemoteName>splash_image.png</RemoteName>
@@ -561,6 +554,11 @@
561554
<Overwrite>true</Overwrite>
562555
</Platform>
563556
</DeployFile>
557+
<DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Android__Demos\splash_image_def.xml" Configuration="Debug" Class="AndroidSplashImageDef">
558+
<Platform Name="Android">
559+
<Overwrite>true</Overwrite>
560+
</Platform>
561+
</DeployFile>
564562
<DeployFile LocalName="..\..\Compiled\BIN_IDExx.x_Win32__Demos\Cipher_FMX.exe" Configuration="Debug" Class="ProjectOutput">
565563
<Platform Name="Win32">
566564
<RemoteName>Cipher_FMX.exe</RemoteName>

‎Demos/Cipher_FMX/MainForm.pas‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ interface
2323
System.SysUtils, System.Types, System.UITypes, System.Classes, System.Variants,
2424
FMX.Types, FMX.Controls, FMX.Forms, FMX.Graphics, FMX.Dialogs, FMX.Layouts,
2525
FMX.StdCtrls, FMX.ListBox, FMX.Controls.Presentation, FMX.Edit, System.Rtti,
26-
FMX.Grid.Style, FMX.Grid, FMX.ScrollBox, DECCipherBase, DECFormatBase;
26+
{$IF RTLVersion < 31}
27+
{$ELSE}
28+
FMX.Grid.Style,
29+
{$ENDIF}
30+
FMX.Grid, FMX.ScrollBox, DECCipherBase, DECFormatBase;
2731

2832
type
2933
/// <summary>
@@ -237,16 +241,23 @@ function TFormMain.GetSelectedCipherMode:TCipherMode;
237241
end;
238242

239243
procedure TFormMain.ShowErrorMessage(ErrorMsg: string);
244+
{$IF RTLVersion > 30}
240245
var
241246
AsyncDlg : IFMXDialogServiceASync;
247+
{$ENDIF}
242248
begin
249+
{$IF RTLVersion > 30}
243250
if TPlatformServices.Current.SupportsPlatformService(IFMXDialogServiceAsync,
244251
IInterface(AsyncDlg)) then
245252
AsyncDlg.MessageDialogAsync(Translate(ErrorMsg),
246253
TMsgDlgType.mtError, [TMsgDlgBtn.mbOk], TMsgDlgBtn.mbOk, 0,
247254
procedure (const AResult: TModalResult)
248255
begin
249256
end);
257+
{$ELSE}
258+
MessageDlg(Translate(ErrorMsg),
259+
TMsgDlgType.mtError, [TMsgDlgBtn.mbOk], 0);
260+
{$ENDIF}
250261
end;
251262

252263
procedure TFormMain.ComboBoxCipherAlgorithmChange(Sender: TObject);

‎Demos/HashBenchmark_FMX/HashBenchmark.dproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,9 @@
249249
</Excluded_Packages>
250250
</Delphi.Personality>
251251
<Deployment Version="3">
252-
<DeployFile LocalName="Hash192.png" Configuration="Debug" Class="Android_LauncherIcon192">
252+
<DeployFile LocalName="Crypto_426_320.png" Configuration="Debug" Class="Android_SplashImage426">
253253
<Platform Name="Android64">
254-
<RemoteName>ic_launcher.png</RemoteName>
254+
<RemoteName>splash_image.png</RemoteName>
255255
<Overwrite>true</Overwrite>
256256
</Platform>
257257
</DeployFile>
@@ -315,9 +315,8 @@
315315
<Overwrite>true</Overwrite>
316316
</Platform>
317317
</DeployFile>
318-
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_24x24.png" Configuration="Debug" Class="Android_NotificationIcon24">
318+
<DeployFile LocalName="Android64\Debug\colors.xml" Configuration="Debug" Class="Android_Colors">
319319
<Platform Name="Android64">
320-
<RemoteName>ic_notification.png</RemoteName>
321320
<Overwrite>true</Overwrite>
322321
</Platform>
323322
</DeployFile>
@@ -331,8 +330,9 @@
331330
<Overwrite>true</Overwrite>
332331
</Platform>
333332
</DeployFile>
334-
<DeployFile LocalName="Android64\Debug\colors.xml" Configuration="Debug" Class="Android_Colors">
333+
<DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_24x24.png" Configuration="Debug" Class="Android_NotificationIcon24">
335334
<Platform Name="Android64">
335+
<RemoteName>ic_notification.png</RemoteName>
336336
<Overwrite>true</Overwrite>
337337
</Platform>
338338
</DeployFile>
@@ -415,9 +415,9 @@
415415
<Overwrite>true</Overwrite>
416416
</Platform>
417417
</DeployFile>
418-
<DeployFile LocalName="Crypto_426_320.png" Configuration="Debug" Class="Android_SplashImage426">
418+
<DeployFile LocalName="Hash192.png" Configuration="Debug" Class="Android_LauncherIcon192">
419419
<Platform Name="Android64">
420-
<RemoteName>splash_image.png</RemoteName>
420+
<RemoteName>ic_launcher.png</RemoteName>
421421
<Overwrite>true</Overwrite>
422422
</Platform>
423423
</DeployFile>

‎Demos/HashBenchmark_FMX/HashBenchmark.res‎

276 Bytes
Binary file not shown.

‎Demos/HashBenchmark_FMX/MainForm.fmx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,14 @@ object FormMain: TFormMain
4242
StyleLookup = 'gridstyle'
4343
TabOrder = 0
4444
RowCount = 0
45-
Options = [ColumnResize, ColLines, RowLines, RowSelect, Tabs, Header, AutoDisplacement]
45+
Options = [ColumnResize, ColLines, RowLines, RowSelect, Tabs, Header]
4646
Viewport.Width = 621.000000000000000000
4747
Viewport.Height = 344.000000000000000000
4848
object StringColumn1: TStringColumn
4949
Header = 'Algorithm'
5050
ReadOnly = True
5151
end
5252
object StringColumn2: TStringColumn
53-
HorzAlign = Trailing
5453
Header = 'Speed MB/s'
5554
end
5655
object StringColumn3: TStringColumn

‎Demos/HashBenchmark_FMX/MainForm.pas‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ interface
2121
uses
2222
System.SysUtils, System.Types, System.UITypes, System.Classes, System.Variants,
2323
FMX.Types, FMX.Controls, FMX.Forms, FMX.Graphics, FMX.Dialogs, FMX.Platform,
24-
FMX.Controls.Presentation, FMX.StdCtrls, System.Rtti, FMX.Grid.Style,
24+
FMX.Controls.Presentation, FMX.StdCtrls, System.Rtti,
25+
{$IF RTLVersion < 31}
26+
{$ELSE}
27+
FMX.Grid.Style,
28+
{$ENDIF}
2529
FMX.Grid, FMX.ScrollBox, FMX.Objects, System.Diagnostics;
2630

2731
type
@@ -183,6 +187,11 @@ procedure TFormMain.b_StartClick(Sender: TObject);
183187
procedure TFormMain.FormCreate(Sender: TObject);
184188
begin
185189
b_CopyToClipboard.Enabled := false;
190+
191+
// This property is only supported from 10.4 onwards, so we set it in code
192+
{$IF RTLVersion >= 34}
193+
StringColumn2.HorzAlign := TTextAlign.Trailing;
194+
{$ENDIF}
186195
end;
187196

188197
procedure TFormMain.FormResize(Sender: TObject);
@@ -217,7 +226,7 @@ procedure TFormMain.RunBenchmark(ClassName: string; RowIndex: Integer);
217226

218227
sg_Results.Cells[1, RowIndex] :=
219228
Format('%0:f', [cIterations / (FStopwatch.ElapsedMilliseconds/1000)]);
220-
sg_Results.Cells[2, RowIndex] := FStopwatch.Elapsed.ToString;
229+
sg_Results.Cells[2, RowIndex] := FStopwatch.Elapsed;
221230
finally
222231
Hash.Free;
223232
end;

0 commit comments

Comments
 (0)