Skip to content

Commit a457302

Browse files
carloBarazzettacarloBarazzetta
committed
ver.1.0.1
Fixed settings filename Fixed setup registering 32bit dll added setup file
1 parent c600861 commit a457302

16 files changed

+63
-55
lines changed

‎Ext/skia4delphi/Source/Skia.pas‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3738,7 +3738,13 @@ class function TSkStreamAdapter.get_position_proc(context: Pointer): size_t;
37383738
class function TSkStreamAdapter.read_proc(context, buffer: Pointer;
37393739
size: size_t): size_t;
37403740
begin
3741-
Result := TStream(context).Read(buffer^, size);
3741+
if buffer <> nil then
3742+
Result := TStream(context).Read(buffer^, size)
3743+
else
3744+
begin
3745+
Result := Min(Int64(size), TStream(context).Size - TStream(context).Position);
3746+
TStream(context).Position := TStream(context).Position + Int64(Result);
3747+
end;
37423748
end;
37433749

37443750
class function TSkStreamAdapter.seek_proc(context: Pointer;

‎Ext/skia4delphi/Source/VCL/Skia.Vcl.pas‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,9 +1195,14 @@ function TSkBitmapHelper.ToSkImage: ISkImage;
11951195
GetMem(LPixels, LStride * Height);
11961196
try
11971197
FlipPixels(Width, Height, ScanLine[Height - 1], LStride, LPixels, LStride);
1198-
Result := TSkImage.MakeFromRaster(TSkImageInfo.Create(Width, Height), LPixels, LStride);
1199-
finally
1198+
Result := TSkImage.MakeFromRaster(TSkImageInfo.Create(Width, Height), LPixels, LStride,
1199+
procedure (const APixels: Pointer)
1200+
begin
1201+
FreeMem(APixels);
1202+
end);
1203+
except
12001204
FreeMem(LPixels);
1205+
raise;
12011206
end;
12021207
end;
12031208

‎README.md‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# SKIA Shell Extensions and Lottie Editor [![License](https://img.shields.io/badge/License-Apache%202.0-yellowgreen.svg)](https://opensource.org/licenses/Apache-2.0)
1+
# SKIA Shell Extensions and Lottie Editor [![License](https://img.shields.io/badge/License-Apache%202.0-yellowgreen.svg)](https://opensource.org/licenses/Apache-2.0)
22

3-
**Latest Version 1.0.0 - 23 Sep 2022**
3+
**Latest Version 1.0.1 - 24 Sep 2022**
44

55
**A collection of extensions tools for image and animations files, integrated into Microsoft Windows Explorer (Vista, 7, 8, 10 and 11):**
66

@@ -68,7 +68,11 @@ To manually install the SKIAShellExtensions.dll follow these steps:
6868

6969
## Release Notes ##
7070

71-
24 Set 2022: ver. 1.0.0
71+
24 Set 2022: ver. 1.0.1
72+
- Fixed Setup registering 32bit dll
73+
- Fixed settings filename
74+
75+
23 Set 2022: ver. 1.0.0
7276
- First version
7377

7478
## Credits

‎Setup/Output/SKIAShellExtensionsSetup.exe‎

24.6 MB
Binary file not shown.

‎Setup/SKIAShellExtensions.iss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; Script generated by the Inno Setup Script Wizard.
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33
#define MyAppName 'SKIA Shell Extensions and Lottie Text Editor'
4-
#define MyAppVersion '1.0.0'
4+
#define MyAppVersion '1.0.1'
55

66
[Setup]
77
AppName={#MyAppName}
@@ -47,14 +47,14 @@ Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:Ad
4747

4848
[Files]
4949
; 32 Bit files
50+
Source: "..\Bin32\sk4d.dll"; DestDir: "{sys}"; Flags : sharedfile 32bit; Components: ShellExtensions
5051
Source: "..\Bin32\LottieTextEditor.exe"; DestDir: "{app}"; Flags: ignoreversion 32bit; Components: Editor
51-
Source: "..\Bin32\SKIAShellExtensions32.dll"; DestDir: {app}; Flags : regserver sharedfile noregerror; Components: ShellExtensions
52-
Source: "..\Bin32\sk4d.dll"; DestDir: {app}; Flags : sharedfile noregerror; Components: ShellExtensions
52+
Source: "..\Bin32\SKIAShellExtensions32.dll"; DestDir: {app}; Flags : regserver sharedfile noregerror 32bit; Components: ShellExtensions
5353

5454
; 64 Bit files
55+
Source: "..\Bin64\sk4d.dll"; DestDir: "{sys}"; Flags : 64bit sharedfile; Components: ShellExtensions
5556
Source: "..\Bin64\LottieTextEditor.exe"; DestDir: "{app}"; Flags: ignoreversion 64bit; Components: Editor
5657
Source: "..\Bin64\SKIAShellExtensions.dll"; DestDir: {app}; Flags : 64bit regserver sharedfile noregerror; Components: ShellExtensions
57-
Source: "..\Bin64\sk4d.dll"; DestDir: {app}; Flags : 64bit sharedfile noregerror; Components: ShellExtensions
5858

5959
[Icons]
6060
Name: "{group}\LottieTextEditor"; Filename: "{app}\LottieTextEditor.exe"; WorkingDir: "{app}"; IconFilename: "{app}\LottieTextEditor.exe"; Components: Editor

‎Source/LottieTextEditor.dproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<Icon_MainIcon>..\Icons\logo.ico</Icon_MainIcon>
6868
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
6969
<VerInfo_Locale>1033</VerInfo_Locale>
70-
<VerInfo_Keys>CompanyName=Ethea S.r.l.;FileDescription=SKIA/Lottie Text Editor;FileVersion=1.0.0.0;InternalName=;LegalCopyright=Copyright © 2022 - Ethea S.r.l.;LegalTrademarks=;OriginalFilename=;ProductName=SKIA/Lottie Text Editor;ProductVersion=1.0;Comments=</VerInfo_Keys>
70+
<VerInfo_Keys>CompanyName=Ethea S.r.l.;FileDescription=SKIA/Lottie Text Editor;FileVersion=1.0.1.0;InternalName=;LegalCopyright=Copyright © 2022 - Ethea S.r.l.;LegalTrademarks=;OriginalFilename=;ProductName=SKIA/Lottie Text Editor;ProductVersion=1.0;Comments=</VerInfo_Keys>
7171
<Custom_Styles>Glow|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Glow.vsf;Sky|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Sky.vsf;Windows10|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10.vsf;&quot;Windows10 Dark|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10Dark.vsf&quot;;&quot;Windows10 SlateGray|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10SlateGray.vsf&quot;;&quot;Windows11 Modern Dark|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows11_Modern_Dark.vsf&quot;;&quot;Windows11 Modern Light|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows11_Modern_Light.vsf&quot;;&quot;Flat UI Light|VCLSTYLE|$(BDSCOMMONDIR)\Styles\FlatUILight.vsf&quot;;&quot;Windows10 BlackPearl|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10BlackPearl.vsf&quot;;&quot;Windows10 Blue Whale|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10BlueWhale.vsf&quot;;&quot;Windows10 Blue Whale LE|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10BlueWhaleLE.vsf&quot;;&quot;Windows10 Clear Day|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10ClearDay.vsf&quot;;&quot;Windows10 Malibu|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10Malibu.vsf&quot;</Custom_Styles>
7272
<DCC_DebugInformation>0</DCC_DebugInformation>
7373
<DCC_ImportedDataReferences>false</DCC_ImportedDataReferences>
@@ -76,6 +76,7 @@
7676
<DCC_DcuOutput>..\Dcu\D11</DCC_DcuOutput>
7777
<DCC_DependencyCheckOutputName>..\..\exe\InstantXMLEditor.exe</DCC_DependencyCheckOutputName>
7878
<DCC_Define>VCLSTYLEUTILS;$(DCC_Define)</DCC_Define>
79+
<VerInfo_Release>1</VerInfo_Release>
7980
</PropertyGroup>
8081
<PropertyGroup Condition="'$(Base_Win32)'!=''">
8182
<DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Bde;$(DCC_Namespace)</DCC_Namespace>

‎Source/LottieTextEditor.res‎

0 Bytes
Binary file not shown.

‎Source/PreviewForm.dfm‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
inherited FrmPreview: TFrmPreview
22
Left = 522
33
Top = 286
4-
ClientHeight = 617
5-
ClientWidth = 617
4+
ClientHeight = 616
5+
ClientWidth = 613
66
DoubleBuffered = True
77
Font.Name = 'Segoe UI'
88
OnAfterMonitorDpiChanged = FormAfterMonitorDpiChanged
@@ -12,15 +12,15 @@ inherited FrmPreview: TFrmPreview
1212
TextHeight = 13
1313
inherited Label1: TLabel
1414
Top = 338
15-
Width = 611
16-
Height = 217
15+
Width = 607
16+
Height = 216
1717
ExplicitTop = 338
1818
ExplicitWidth = 146
1919
end
2020
object Splitter: TSplitter
2121
Left = 0
2222
Top = 329
23-
Width = 617
23+
Width = 613
2424
Height = 6
2525
Cursor = crVSplit
2626
Align = alTop
@@ -32,12 +32,11 @@ inherited FrmPreview: TFrmPreview
3232
object PanelTop: TPanel
3333
Left = 0
3434
Top = 0
35-
Width = 617
35+
Width = 613
3636
Height = 35
3737
Align = alTop
3838
BevelOuter = bvNone
3939
TabOrder = 0
40-
ExplicitWidth = 613
4140
object ToolBar: TToolBar
4241
Left = 0
4342
Top = 0
@@ -180,15 +179,14 @@ inherited FrmPreview: TFrmPreview
180179
object PanelEditor: TPanel
181180
Left = 0
182181
Top = 35
183-
Width = 617
182+
Width = 613
184183
Height = 294
185184
Align = alTop
186185
BevelOuter = bvNone
187186
Caption = 'PanelEditor'
188187
ParentBackground = False
189188
TabOrder = 1
190189
Visible = False
191-
ExplicitWidth = 613
192190
object SynEdit: TSynEdit
193191
Left = 0
194192
Top = 0
@@ -224,8 +222,8 @@ inherited FrmPreview: TFrmPreview
224222
end
225223
object StatusBar: TStatusBar
226224
Left = 0
227-
Top = 598
228-
Width = 617
225+
Top = 597
226+
Width = 613
229227
Height = 19
230228
Panels = <>
231229
ParentFont = True
@@ -234,14 +232,12 @@ inherited FrmPreview: TFrmPreview
234232
'SKIA Preview - Ver.%s (%dbit)- Copyright '#169' 2021-2022 Ethea S.r.l' +
235233
'. - Author: Carlo Barazzetta'
236234
UseSystemFont = False
237-
ExplicitTop = 597
238-
ExplicitWidth = 613
239235
end
240236
object ImagePanel: TPanel
241237
Left = 0
242238
Top = 335
243-
Width = 617
244-
Height = 223
239+
Width = 613
240+
Height = 222
245241
Align = alClient
246242
BevelOuter = bvNone
247243
DoubleBuffered = True
@@ -251,6 +247,8 @@ inherited FrmPreview: TFrmPreview
251247
TabOrder = 3
252248
StyleElements = []
253249
ExplicitLeft = 1
250+
ExplicitWidth = 617
251+
ExplicitHeight = 223
254252
object panelPreview: TPanel
255253
Left = 0
256254
Top = 0
@@ -290,16 +288,14 @@ inherited FrmPreview: TFrmPreview
290288
end
291289
object PlayerPanel: TPanel
292290
Left = 0
293-
Top = 558
294-
Width = 617
291+
Top = 557
292+
Width = 613
295293
Height = 40
296294
Align = alBottom
297295
BevelInner = bvLowered
298296
BevelOuter = bvNone
299297
ParentBackground = False
300298
TabOrder = 4
301-
ExplicitTop = 557
302-
ExplicitWidth = 613
303299
object RunLabel: TLabel
304300
AlignWithMargins = True
305301
Left = 572

‎Source/PreviewForm.pas‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ procedure TFrmPreview.ToolButtonStopClick(Sender: TObject);
456456

457457
procedure TFrmPreview.ToolButtonAboutClick(Sender: TObject);
458458
begin
459-
ShowAboutForm(DialogPosRect, Title_LottiePreview);
459+
ShowAboutForm(DialogPosRect, Title_SKIAPreview);
460460
end;
461461

462462
procedure TFrmPreview.ToolButtonMouseEnter(Sender: TObject);
@@ -539,7 +539,7 @@ procedure TFrmPreview.UpdateFromSettings;
539539

540540
procedure TFrmPreview.ToolButtonSettingsClick(Sender: TObject);
541541
begin
542-
if ShowSettings(DialogPosRect, Title_LottiePreview, SynEdit, FPreviewSettings, True) then
542+
if ShowSettings(DialogPosRect, Title_SKIAPreview, SynEdit, FPreviewSettings, True) then
543543
begin
544544
FPreviewSettings.WriteSettings(SynEdit.Highlighter, nil);
545545
UpdateFromSettings;

‎Source/SKIAShellExtensions.dproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<Icon_MainIcon>..\Icons\logo.ico</Icon_MainIcon>
5959
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
6060
<VerInfo_Locale>1033</VerInfo_Locale>
61-
<VerInfo_Keys>CompanyName=Ethea S.r.l.;FileDescription=SKIA Shell Extensions 32bit;FileVersion=1.0.0.0;InternalName=;LegalCopyright=Copyright © 2022 Ethea S.r.l.;LegalTrademarks=;OriginalFilename=;ProductName=SKIA Shell Extensions 32bit;ProductVersion=1.0;Comments=</VerInfo_Keys>
61+
<VerInfo_Keys>CompanyName=Ethea S.r.l.;FileDescription=SKIA Shell Extensions 32bit;FileVersion=1.0.1.0;InternalName=;LegalCopyright=Copyright © 2022 Ethea S.r.l.;LegalTrademarks=;OriginalFilename=;ProductName=SKIA Shell Extensions 32bit;ProductVersion=1.0;Comments=</VerInfo_Keys>
6262
<Custom_Styles>Glow|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Glow.vsf;Sky|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Sky.vsf;Windows10|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10.vsf;&quot;Windows10 Dark|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10Dark.vsf&quot;;&quot;Windows10 SlateGray|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10SlateGray.vsf&quot;;&quot;Windows11 Modern Dark|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows11_Modern_Dark.vsf&quot;;&quot;Windows11 Modern Light|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows11_Modern_Light.vsf&quot;;&quot;Flat UI Light|VCLSTYLE|$(BDSCOMMONDIR)\Styles\FlatUILight.vsf&quot;;&quot;Windows10 BlackPearl|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10BlackPearl.vsf&quot;;&quot;Windows10 Blue Whale|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10BlueWhale.vsf&quot;;&quot;Windows10 Blue Whale LE|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10BlueWhaleLE.vsf&quot;;&quot;Windows10 Clear Day|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10ClearDay.vsf&quot;;&quot;Windows10 Malibu|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10Malibu.vsf&quot;</Custom_Styles>
6363
<DCC_UsePackage>rtl;vcl;vclx;vclactnband;xmlrtl;VclSmp;vclimg;svnui;svn;bdertl;TeeUI;TeeDB;Tee;vcldb;dbrtl;vcldbx;vcltouch;dsnap;dsnapcon;vclib;ibxpress;adortl;IndyCore;IndySystem;IndyProtocols;inet;intrawebdb_110_150;Intraweb_110_150;vclie;websnap;webdsnap;inetdb;inetdbbde;inetdbxpress;soaprtl;vclribbon;dbexpress;DbxCommonDriver;DataSnapIndy10ServerTransport;DataSnapProviderClient;DbxClientDriver;DataSnapClient;dbxcds;DataSnapServer;AzureCloud;DBXInterBaseDriver;DBXMySQLDriver;DBXFirebirdDriver;DBXSybaseASEDriver;DBXSybaseASADriver;DBXOracleDriver;DBXMSSQLDriver;DBXInformixDriver;DBXDb2Driver;Hydra_Core_D15;SynEdit_RXE;mbColorLibDXE;JclDeveloperTools;Jcl;JclVcl;JclContainers;JvCore;JvSystem;JvStdCtrls;JvAppFrm;JvBands;JvDB;JvDlgs;JvBDE;JvControls;JvCmp;JvCrypt;JvCustom;JvDocking;JvDotNetCtrls;JvGlobus;JvHMI;JvJans;JvManagedThreads;JvMM;JvNet;JvPageComps;JvPascalInterpreter;JvPluginSystem;JvPrintPreview;JvRuntimeDesign;JvTimeFramework;JvWizards;JvXPCtrls;WinSkinDXE;bsfd2011;IceTabSet;$(DCC_UsePackage)</DCC_UsePackage>
6464
<DCC_DcuOutput>.\$(Config)\$(Platform)</DCC_DcuOutput>
@@ -67,8 +67,6 @@
6767
<DCC_UnitSearchPath>..\Ext\SynEdit\Source;..\Ext\SVGIconImageList\Source;..\Ext\SVGIconImageList\Svg;..\Ext\VCLStyleUtils\Common;..\Ext\VCLStyleUtils\DDetours\Source;..\Ext\SVGIconImageList\Image32\Source;..\Ext\Skia4Delphi\Source;..\Ext\Skia4Delphi\Source\VCL;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
6868
<DCC_ExeOutput>..\Bin64</DCC_ExeOutput>
6969
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
70-
<VerInfo_MajorVer>2</VerInfo_MajorVer>
71-
<VerInfo_MinorVer>6</VerInfo_MinorVer>
7270
<VerInfo_Release>1</VerInfo_Release>
7371
</PropertyGroup>
7472
<PropertyGroup Condition="'$(Base_Win32)'!=''">

0 commit comments

Comments
 (0)