Minor bugfixes

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5732 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
gbamber
2017-01-30 10:13:35 +00:00
parent e109947a5f
commit 32453f82f2
2 changed files with 90 additions and 81 deletions

View File

@ -4,13 +4,13 @@
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Version Value="10"/> <Version Value="10"/>
<BuildModes Active="Linux64"/> <BuildModes Active="Linux64"/>
<Units Count="17"> <Units Count="18">
<Unit0> <Unit0>
<Filename Value="lauinstaller.lpr"/> <Filename Value="lauinstaller.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="2"/> <EditorIndex Value="1"/>
<CursorPos X="25" Y="5"/> <CursorPos X="25" Y="5"/>
<UsageCount Value="31"/> <UsageCount Value="34"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
@ -19,9 +19,10 @@
<ComponentName Value="mainform"/> <ComponentName Value="mainform"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<TopLine Value="194"/> <IsVisibleTab Value="True"/>
<CursorPos X="65" Y="215"/> <TopLine Value="152"/>
<UsageCount Value="31"/> <CursorPos Y="180"/>
<UsageCount Value="34"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
</Unit1> </Unit1>
@ -34,19 +35,18 @@
</Unit2> </Unit2>
<Unit3> <Unit3>
<Filename Value="..\ulazautoupdate.pas"/> <Filename Value="..\ulazautoupdate.pas"/>
<IsVisibleTab Value="True"/> <EditorIndex Value="9"/>
<EditorIndex Value="10"/>
<TopLine Value="111"/> <TopLine Value="111"/>
<CursorPos X="18" Y="134"/> <CursorPos X="18" Y="134"/>
<UsageCount Value="14"/> <UsageCount Value="15"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit3> </Unit3>
<Unit4> <Unit4>
<Filename Value="..\ushortcut.pas"/> <Filename Value="..\ushortcut.pas"/>
<EditorIndex Value="3"/> <EditorIndex Value="2"/>
<TopLine Value="403"/> <TopLine Value="403"/>
<CursorPos X="93" Y="449"/> <CursorPos X="93" Y="449"/>
<UsageCount Value="14"/> <UsageCount Value="15"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit4> </Unit4>
<Unit5> <Unit5>
@ -76,35 +76,35 @@
</Unit8> </Unit8>
<Unit9> <Unit9>
<Filename Value="X:\deleteme\issrc-master\issrc-master\Projects\Install.pas"/> <Filename Value="X:\deleteme\issrc-master\issrc-master\Projects\Install.pas"/>
<EditorIndex Value="8"/> <EditorIndex Value="7"/>
<TopLine Value="85"/> <TopLine Value="85"/>
<CursorPos X="50" Y="24"/> <CursorPos X="50" Y="24"/>
<UsageCount Value="12"/> <UsageCount Value="13"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit9> </Unit9>
<Unit10> <Unit10>
<Filename Value="umakeshortcut.pas"/> <Filename Value="umakeshortcut.pas"/>
<EditorIndex Value="9"/> <EditorIndex Value="8"/>
<TopLine Value="150"/> <TopLine Value="150"/>
<CursorPos Y="166"/> <CursorPos Y="166"/>
<UsageCount Value="22"/> <UsageCount Value="23"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit10> </Unit10>
<Unit11> <Unit11>
<Filename Value="C:\laztrunk\fpc\packages\winunits-base\src\shlobj.pp"/> <Filename Value="C:\laztrunk\fpc\packages\winunits-base\src\shlobj.pp"/>
<EditorIndex Value="7"/> <EditorIndex Value="6"/>
<TopLine Value="2332"/> <TopLine Value="2332"/>
<CursorPos X="6" Y="2362"/> <CursorPos X="6" Y="2362"/>
<UsageCount Value="11"/> <UsageCount Value="12"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit11> </Unit11>
<Unit12> <Unit12>
<Filename Value="C:\laztrunk\fpc\packages\winunits-base\src\shellapi.pp"/> <Filename Value="C:\laztrunk\fpc\packages\winunits-base\src\shellapi.pp"/>
<UnitName Value="ShellApi"/> <UnitName Value="ShellApi"/>
<EditorIndex Value="6"/> <EditorIndex Value="5"/>
<TopLine Value="225"/> <TopLine Value="225"/>
<CursorPos X="19" Y="233"/> <CursorPos X="19" Y="233"/>
<UsageCount Value="11"/> <UsageCount Value="12"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit12> </Unit12>
<Unit13> <Unit13>
@ -116,149 +116,158 @@
</Unit13> </Unit13>
<Unit14> <Unit14>
<Filename Value="C:\laztrunk\fpc\rtl\objpas\sysutils\finah.inc"/> <Filename Value="C:\laztrunk\fpc\rtl\objpas\sysutils\finah.inc"/>
<EditorIndex Value="5"/> <EditorIndex Value="4"/>
<CursorPos X="10" Y="33"/> <CursorPos X="10" Y="33"/>
<UsageCount Value="10"/> <UsageCount Value="11"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit14> </Unit14>
<Unit15> <Unit15>
<Filename Value="C:\laztrunk\lazarus\components\lazutils\lazfileutils.pas"/> <Filename Value="C:\laztrunk\lazarus\components\lazutils\lazfileutils.pas"/>
<UnitName Value="LazFileUtils"/> <UnitName Value="LazFileUtils"/>
<EditorIndex Value="4"/> <EditorIndex Value="3"/>
<TopLine Value="58"/> <TopLine Value="76"/>
<CursorPos X="23" Y="102"/> <CursorPos X="10" Y="103"/>
<UsageCount Value="10"/> <UsageCount Value="11"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit15> </Unit15>
<Unit16> <Unit16>
<Filename Value="..\testapp\umainform.pas"/> <Filename Value="..\testapp\umainform.pas"/>
<EditorIndex Value="1"/> <ComponentName Value="mainform"/>
<TopLine Value="139"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<EditorIndex Value="-1"/>
<TopLine Value="91"/>
<CursorPos Y="168"/> <CursorPos Y="168"/>
<UsageCount Value="10"/> <UsageCount Value="11"/>
<Loaded Value="True"/>
</Unit16> </Unit16>
<Unit17>
<Filename Value="C:\laztrunk\fpc\rtl\unix\sysunixh.inc"/>
<EditorIndex Value="-1"/>
<TopLine Value="4"/>
<CursorPos X="2" Y="31"/>
<UsageCount Value="10"/>
</Unit17>
</Units> </Units>
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="umakeshortcut.pas"/> <Filename Value="X:\deleteme\issrc-master\issrc-master\Projects\Install.pas"/>
<Caret Line="136" Column="43" TopLine="118"/> <Caret Line="1974" TopLine="1933"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="..\ushortcut.pas"/> <Filename Value="X:\deleteme\issrc-master\issrc-master\Projects\Install.pas"/>
<Caret Line="199" TopLine="167"/> <Caret Line="1856" Column="45" TopLine="1831"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="..\ushortcut.pas"/> <Filename Value="..\ushortcut.pas"/>
<Caret Line="193" Column="21" TopLine="166"/> <Caret Line="154" Column="21" TopLine="132"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="X:\deleteme\issrc-master\issrc-master\Projects\Install.pas"/> <Filename Value="..\ushortcut.pas"/>
<Caret Line="1974" TopLine="1933"/> <Caret Line="180" Column="59" TopLine="160"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="X:\deleteme\issrc-master\issrc-master\Projects\Install.pas"/> <Filename Value="..\ushortcut.pas"/>
<Caret Line="1856" Column="45" TopLine="1831"/> <Caret Line="205" TopLine="163"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="..\ushortcut.pas"/> <Filename Value="..\ushortcut.pas"/>
<Caret Line="154" Column="21" TopLine="132"/> <Caret Line="198" Column="23" TopLine="171"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="..\ushortcut.pas"/>
<Caret Line="180" Column="59" TopLine="160"/>
</Position7>
<Position8>
<Filename Value="..\ushortcut.pas"/>
<Caret Line="205" TopLine="163"/>
</Position8>
<Position9>
<Filename Value="..\ushortcut.pas"/>
<Caret Line="198" Column="23" TopLine="171"/>
</Position9>
<Position10>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="130" Column="24" TopLine="116"/> <Caret Line="130" Column="24" TopLine="116"/>
</Position10> </Position7>
<Position11> <Position8>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="131" Column="24" TopLine="117"/> <Caret Line="131" Column="24" TopLine="117"/>
</Position11> </Position8>
<Position12> <Position9>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="132" TopLine="123"/> <Caret Line="132" TopLine="123"/>
</Position9>
<Position10>
<Filename Value="..\ushortcut.pas"/>
<Caret Line="442" TopLine="398"/>
</Position10>
<Position11>
<Filename Value="..\ushortcut.pas"/>
<Caret Line="436" Column="11" TopLine="404"/>
</Position11>
<Position12>
<Filename Value="..\ushortcut.pas"/>
<Caret Line="438" Column="25" TopLine="404"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="..\ushortcut.pas"/> <Filename Value="..\ushortcut.pas"/>
<Caret Line="442" TopLine="398"/> <Caret Line="428" Column="45" TopLine="404"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="..\ushortcut.pas"/> <Filename Value="..\ushortcut.pas"/>
<Caret Line="436" Column="11" TopLine="404"/> <Caret Line="390" Column="27" TopLine="369"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="..\ushortcut.pas"/> <Filename Value="..\ushortcut.pas"/>
<Caret Line="438" Column="25" TopLine="404"/> <Caret Line="438" Column="23" TopLine="401"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="..\ushortcut.pas"/> <Filename Value="..\ushortcut.pas"/>
<Caret Line="428" Column="45" TopLine="404"/> <Caret Line="440" Column="79" TopLine="404"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="..\ushortcut.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="390" Column="27" TopLine="369"/> <Caret Line="119" Column="50" TopLine="118"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="..\ushortcut.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="438" Column="23" TopLine="401"/> <Caret Line="120" Column="50" TopLine="119"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="..\ushortcut.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="440" Column="79" TopLine="404"/> <Caret Line="122" Column="50" TopLine="121"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="119" Column="50" TopLine="118"/> <Caret Line="220" Column="30" TopLine="206"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="120" Column="50" TopLine="119"/> <Caret Line="105" Column="3" TopLine="103"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="122" Column="50" TopLine="121"/> <Caret Line="230" Column="27" TopLine="209"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="220" Column="30" TopLine="206"/> <Caret Line="215" Column="45" TopLine="193"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="105" Column="3" TopLine="103"/> <Caret Line="226" Column="56" TopLine="191"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="umainform.pas"/> <Filename Value="..\ulazautoupdate.pas"/>
<Caret Line="230" Column="27" TopLine="209"/> <Caret Line="355" Column="24" TopLine="326"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="umainform.pas"/> <Filename Value="..\ulazautoupdate.pas"/>
<Caret Line="215" Column="45" TopLine="193"/> <Caret Line="1192" Column="17" TopLine="1182"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="226" Column="56" TopLine="191"/> <Caret Line="231" Column="20" TopLine="204"/>
</Position27> </Position27>
<Position28> <Position28>
<Filename Value="..\ulazautoupdate.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="355" Column="24" TopLine="326"/> <Caret Line="254" Column="33" TopLine="218"/>
</Position28> </Position28>
<Position29> <Position29>
<Filename Value="..\ulazautoupdate.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="1192" Column="17" TopLine="1182"/> <Caret Line="255" Column="29" TopLine="218"/>
</Position29> </Position29>
<Position30> <Position30>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="231" Column="20" TopLine="204"/> <Caret Line="251" Column="51" TopLine="213"/>
</Position30> </Position30>
</JumpHistory> </JumpHistory>
</ProjectSession> </ProjectSession>

View File

@ -1433,7 +1433,7 @@ if (lcl_major > 0) and (lcl_minor > 6) then
// This uses a resource file added via Project/Options (Laz 1.7+) // This uses a resource file added via Project/Options (Laz 1.7+)
if not FileExistsUTF8(sReadMePath) then if not FileExistsUTF8(sReadMePath) then
begin begin
// create a resource stream which points to the po file // create a resource stream which points to the file
S := TResourceStream.Create(HInstance, 'README', MakeIntResource(10)); S := TResourceStream.Create(HInstance, 'README', MakeIntResource(10));
try try
F := TFileStream.Create(sReadMePath, fmCreate); F := TFileStream.Create(sReadMePath, fmCreate);