pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

To V 0.1.3: BugFix: WriteIdent method without Version Info now covered by meaningful error message

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5556 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
gbamber
2016-12-22 10:11:13 +00:00
parent 053b9c89c7
commit 7b154e4abd
4 changed files with 46 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/cryptini/latest_stable/cryptini.lpk
View File

@ -80,7 +80,7 @@ Please update this versioninfo alongside the constant C_VERSION
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
"/> "/>
<Version Minor="1" Release="2"/> <Version Minor="1" Release="3"/>
<Files Count="1"> <Files Count="1">
<Item1> <Item1>
<Filename Value="ucryptini.pas"/> <Filename Value="ucryptini.pas"/>

70
components/cryptini/latest_stable/demo/cryptinitest.lps
View File

@ -3,14 +3,14 @@
<ProjectSession> <ProjectSession>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Version Value="10"/> <Version Value="10"/>
<BuildModes Active="Win32"/> <BuildModes Active="Win64"/>
<Units Count="51"> <Units Count="51">
<Unit0> <Unit0>
<Filename Value="cryptinitest.lpr"/> <Filename Value="cryptinitest.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="4"/> <EditorIndex Value="2"/>
<TopLine Value="6"/> <TopLine Value="6"/>
<CursorPos Y="49"/> <CursorPos X="36" Y="30"/>
<UsageCount Value="116"/> <UsageCount Value="116"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit0> </Unit0>
@ -20,6 +20,7 @@
<ComponentName Value="mainform"/> <ComponentName Value="mainform"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/>
<TopLine Value="197"/> <TopLine Value="197"/>
<CursorPos X="41" Y="199"/> <CursorPos X="41" Y="199"/>
<UsageCount Value="116"/> <UsageCount Value="116"/>
@ -32,12 +33,10 @@
<ComponentName Value="ShowINIForm"/> <ComponentName Value="ShowINIForm"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<EditorIndex Value="3"/> <EditorIndex Value="-1"/>
<TopLine Value="55"/> <TopLine Value="50"/>
<CursorPos X="3" Y="68"/> <CursorPos X="3" Y="68"/>
<UsageCount Value="108"/> <UsageCount Value="108"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
</Unit2> </Unit2>
<Unit3> <Unit3>
<Filename Value="ukeydialog.pas"/> <Filename Value="ukeydialog.pas"/>
@ -45,12 +44,9 @@
<ComponentName Value="keydialog"/> <ComponentName Value="keydialog"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/> <EditorIndex Value="-1"/>
<EditorIndex Value="2"/>
<CursorPos X="12" Y="29"/> <CursorPos X="12" Y="29"/>
<UsageCount Value="100"/> <UsageCount Value="100"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
</Unit3> </Unit3>
<Unit4> <Unit4>
<Filename Value="uinputsectionvaluesform.pas"/> <Filename Value="uinputsectionvaluesform.pas"/>
@ -402,99 +398,95 @@
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit50> </Unit50>
</Units> </Units>
<JumpHistory Count="23" HistoryIndex="22"> <JumpHistory Count="22" HistoryIndex="21">
<Position1> <Position1>
<Filename Value="ukeydialog.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="29" Column="12"/> <Caret Line="621" Column="26" TopLine="607"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="621" Column="26" TopLine="607"/> <Caret Line="621" Column="26"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="621" Column="26"/> <Caret Line="20" Column="27" TopLine="3"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="20" Column="27" TopLine="3"/> <Caret Line="32" Column="21"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="32" Column="21"/> <Caret Line="185" Column="19" TopLine="155"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="185" Column="19" TopLine="155"/> <Caret Line="32" Column="24" TopLine="18"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="32" Column="24" TopLine="18"/> <Caret Line="234" Column="23" TopLine="222"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="234" Column="23" TopLine="222"/> <Caret Line="185" TopLine="167"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="185" TopLine="167"/> <Caret Line="184" TopLine="166"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="184" TopLine="166"/> <Caret Line="183" TopLine="165"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="183" TopLine="165"/> <Caret Line="270" Column="47" TopLine="241"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="270" Column="47" TopLine="241"/> <Caret Line="933" Column="43" TopLine="99"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="933" Column="43" TopLine="99"/> <Caret Line="191" Column="18" TopLine="179"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="191" Column="18" TopLine="179"/> <Caret Line="153" Column="13" TopLine="153"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="153" Column="13" TopLine="153"/> <Caret Line="385" Column="9" TopLine="371"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="385" Column="9" TopLine="371"/> <Caret Line="11" Column="19"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="11" Column="19"/> <Caret Line="153" Column="13" TopLine="140"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="153" Column="13" TopLine="140"/> <Caret Line="395" TopLine="366"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="395" TopLine="366"/> <Caret Line="154" Column="12" TopLine="125"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="154" Column="12" TopLine="125"/> <Caret Line="153" Column="16" TopLine="127"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="153" Column="16" TopLine="127"/> <Caret Line="163" TopLine="152"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="umainform.pas"/>
<Caret Line="163" TopLine="152"/>
</Position22>
<Position23>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="116" Column="24" TopLine="116"/> <Caret Line="116" Column="24" TopLine="116"/>
</Position23> </Position22>
</JumpHistory> </JumpHistory>
</ProjectSession> </ProjectSession>
</CONFIG> </CONFIG>

11
components/cryptini/latest_stable/ucryptini.pas
View File

@ -15,7 +15,7 @@ unit ucryptini;
{ 'Paranoid' version of TIniFile { 'Paranoid' version of TIniFile
Copyright (C) 2016 Gordon Bamber minesadorada@gmail.com Copyright (C) 2016 Gordon Bamber minesadorada@charcodelvcalle.com
Base 64 code by David Barton Base 64 code by David Barton
This library is free software; you can redistribute it and/or modify it This library is free software; you can redistribute it and/or modify it
@ -219,7 +219,7 @@ const
54, 55, 56, 57, 43, 47); 54, 55, 56, 57, 43, 47);
{$ENDIF} {$ENDIF}
C_VERSION = '0.1.2'; C_VERSION = '0.1.3';
{ {
VERSION HISTORY VERSION HISTORY
=============== ===============
@ -236,7 +236,8 @@ C_VERSION = '0.1.2';
V 0.1.2: Added thread-safe TLockCryptINIFile class V 0.1.2: Added thread-safe TLockCryptINIFile class
for thread-safe operation (GB) for thread-safe operation (GB)
Credit: "Fungus" at http://forum.lazarus.freepascal.org/ Credit: "Fungus" at http://forum.lazarus.freepascal.org/
V 0.1.3: ?? V 0.1.3: BugFix: WriteIdent method without Version Info now covered by meaningful error message.
V 0.1.4: ??
} }
type type
TCryptIniFile = class(TIniFile) TCryptIniFile = class(TIniFile)
@ -792,6 +793,7 @@ begin
WriteString(IDENT_SECTION, IDENT_APPNAME,Application.Title); WriteString(IDENT_SECTION, IDENT_APPNAME,Application.Title);
s:='0.0.0.0'; // Default s:='0.0.0.0'; // Default
VInfo:=TFileVersionInfo.Create(Application); VInfo:=TFileVersionInfo.Create(Application);
TRY
TRY TRY
VInfo.ReadFileInfo; VInfo.ReadFileInfo;
If fileinfo.GetProgramVersion(Version) then If fileinfo.GetProgramVersion(Version) then
@ -799,6 +801,9 @@ begin
finally finally
VInfo.free; VInfo.free;
end; end;
Except
Raise EResNotFound.Create('TCryptINIFile.WriteIdent' + LineEnding + 'Please include Version Info in Project/options to use this function');
end;
WriteString(IDENT_SECTION,IDENT_APPVERSION,s); WriteString(IDENT_SECTION,IDENT_APPVERSION,s);
WriteString(IDENT_SECTION, IDENT_EXE, ParamStrUTF8(0)); WriteString(IDENT_SECTION, IDENT_EXE, ParamStrUTF8(0));
WriteBool(IDENT_SECTION,IDENT_FIRSTRUN,TRUE); WriteBool(IDENT_SECTION,IDENT_FIRSTRUN,TRUE);

2
components/cryptini/latest_stable/updates/update_cryptini.json
View File

@ -7,7 +7,7 @@
"UpdatePackageFiles" : [ "UpdatePackageFiles" : [
{ {
"ForceNotify" : true, "ForceNotify" : true,
"InternalVersion" : 4, "InternalVersion" : 5,
"Name" : "cryptini.lpk", "Name" : "cryptini.lpk",
"Version" : "0.1.2.0" "Version" : "0.1.2.0"
} }