onguard: Fix compilation with at least Laz 1.4.4 / FPC 2.6.4

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8736 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2023-02-23 13:55:39 +00:00
parent 0a8755d05b
commit a5bdd38008
54 changed files with 926 additions and 505 deletions

View File

@ -59,8 +59,8 @@
<UnitName Value="Exdmodu1"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="1"/>
<TopLine Value="177"/>
<CursorPos X="3" Y="228"/>
<TopLine Value="83"/>
<CursorPos X="8" Y="92"/>
<UsageCount Value="21"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
@ -73,6 +73,7 @@
<ResourceBaseClass Value="Form"/>
<UnitName Value="Exdmodu2"/>
<EditorIndex Value="2"/>
<CursorPos X="29" Y="9"/>
<UsageCount Value="21"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
@ -158,123 +159,123 @@
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="..\..\source\ogutil.pas"/>
<Caret Line="516" TopLine="495"/>
<Caret Line="522" TopLine="495"/>
</Position1>
<Position2>
<Filename Value="..\..\source\ogutil.pas"/>
<Caret Line="522" TopLine="495"/>
<Filename Value="exdmodu1.pas"/>
<Caret Line="176" TopLine="155"/>
</Position2>
<Position3>
<Filename Value="..\..\source\ogutil.pas"/>
<Caret Line="517" TopLine="496"/>
<Filename Value="exdmodu1.pas"/>
<Caret Line="177" TopLine="156"/>
</Position3>
<Position4>
<Filename Value="..\..\source\ogutil.pas"/>
<Caret Line="516" TopLine="495"/>
<Filename Value="exdmodu1.pas"/>
<Caret Line="179" TopLine="158"/>
</Position4>
<Position5>
<Filename Value="..\..\source\ogutil.pas"/>
<Caret Line="522" TopLine="495"/>
<Filename Value="exdmodu1.pas"/>
<Caret Line="167" Column="37" TopLine="160"/>
</Position5>
<Position6>
<Filename Value="exdmodu1.pas"/>
<Caret Line="176" TopLine="155"/>
<Caret Line="182" TopLine="161"/>
</Position6>
<Position7>
<Filename Value="exdmodu1.pas"/>
<Caret Line="177" TopLine="156"/>
<Filename Value="..\..\source\onguard.pas"/>
<Caret Line="1179" TopLine="1158"/>
</Position7>
<Position8>
<Filename Value="exdmodu1.pas"/>
<Caret Line="179" TopLine="158"/>
<Filename Value="..\..\source\onguard.pas"/>
<Caret Line="1180" TopLine="1159"/>
</Position8>
<Position9>
<Filename Value="exdmodu1.pas"/>
<Caret Line="167" Column="37" TopLine="160"/>
<Filename Value="..\..\source\onguard.pas"/>
<Caret Line="1181" TopLine="1160"/>
</Position9>
<Position10>
<Filename Value="exdmodu1.pas"/>
<Caret Line="182" TopLine="161"/>
<Caret Line="184" TopLine="163"/>
</Position10>
<Position11>
<Filename Value="..\..\source\onguard.pas"/>
<Caret Line="1179" TopLine="1158"/>
<Caret Line="2085" TopLine="2064"/>
</Position11>
<Position12>
<Filename Value="..\..\source\onguard.pas"/>
<Caret Line="1180" TopLine="1159"/>
<Caret Line="2086" TopLine="2065"/>
</Position12>
<Position13>
<Filename Value="..\..\source\onguard.pas"/>
<Caret Line="1181" TopLine="1160"/>
<Caret Line="2087" Column="40" TopLine="2066"/>
</Position13>
<Position14>
<Filename Value="exdmodu1.pas"/>
<Caret Line="184" TopLine="163"/>
</Position14>
<Position15>
<Filename Value="..\..\source\onguard.pas"/>
<Caret Line="2085" TopLine="2064"/>
</Position15>
<Position16>
<Filename Value="..\..\source\onguard.pas"/>
<Caret Line="2086" TopLine="2065"/>
</Position16>
<Position17>
<Filename Value="..\..\source\onguard.pas"/>
<Caret Line="2087" Column="40" TopLine="2066"/>
</Position17>
<Position18>
<Filename Value="..\..\source\onguard.pas"/>
<Caret Line="2088" TopLine="2067"/>
</Position14>
<Position15>
<Filename Value="exdmodu1.pas"/>
<Caret Line="188" TopLine="137"/>
</Position15>
<Position16>
<Filename Value="exdmodu2.pas"/>
<Caret Line="24" Column="51" TopLine="20"/>
</Position16>
<Position17>
<Filename Value="exdmodu1.pas"/>
<Caret Line="211" Column="75" TopLine="206"/>
</Position17>
<Position18>
<Filename Value="exdmodu1.pas"/>
<Caret Line="176" TopLine="156"/>
</Position18>
<Position19>
<Filename Value="exdmodu1.pas"/>
<Caret Line="188" TopLine="137"/>
<Caret Line="175" TopLine="155"/>
</Position19>
<Position20>
<Filename Value="exdmodu2.pas"/>
<Caret Line="24" Column="51" TopLine="20"/>
<Filename Value="exdmodu1.pas"/>
<Caret Line="178" Column="27" TopLine="156"/>
</Position20>
<Position21>
<Filename Value="exdmodu1.pas"/>
<Caret Line="211" Column="75" TopLine="206"/>
<Caret Line="45" Column="14" TopLine="24"/>
</Position21>
<Position22>
<Filename Value="exdmodu1.pas"/>
<Caret Line="176" TopLine="156"/>
<Filename Value="exdmodu2.pas"/>
<Caret Line="37" Column="52" TopLine="20"/>
</Position22>
<Position23>
<Filename Value="exdmodu1.pas"/>
<Caret Line="175" TopLine="155"/>
<Filename Value="exdmodu2.pas"/>
<Caret Line="57" TopLine="22"/>
</Position23>
<Position24>
<Filename Value="exdmodu1.pas"/>
<Caret Line="178" Column="27" TopLine="156"/>
<Caret Line="210" Column="26" TopLine="199"/>
</Position24>
<Position25>
<Filename Value="exdmodu1.pas"/>
<Caret Line="45" Column="14" TopLine="24"/>
<Caret Line="212" Column="23" TopLine="200"/>
</Position25>
<Position26>
<Filename Value="exdmodu2.pas"/>
<Caret Line="37" Column="52" TopLine="20"/>
<Caret Line="20" Column="28" TopLine="20"/>
</Position26>
<Position27>
<Filename Value="exdmodu2.pas"/>
<Caret Line="57" TopLine="22"/>
<Filename Value="exdmodu1.pas"/>
<Caret Line="177" Column="61" TopLine="177"/>
</Position27>
<Position28>
<Filename Value="exdmodu1.pas"/>
<Caret Line="210" Column="26" TopLine="199"/>
<Filename Value="exdmodu2.pas"/>
<Caret Line="9" Column="29"/>
</Position28>
<Position29>
<Filename Value="exdmodu1.pas"/>
<Caret Line="212" Column="23" TopLine="200"/>
<Caret Line="143" Column="20" TopLine="135"/>
</Position29>
<Position30>
<Filename Value="exdmodu2.pas"/>
<Caret Line="20" Column="28" TopLine="20"/>
<Filename Value="exdmodu1.pas"/>
<Caret Line="167" Column="18" TopLine="131"/>
</Position30>
</JumpHistory>
</ProjectOptions>

View File

@ -89,7 +89,7 @@ end;
procedure TfrmMain.OgSerialNumberCode1GetCode(Sender: TObject; var Code: TCode);
var
S1 : string;
L : integer;
{%H-}L : integer;
begin
{force the INI file to be in the same directory as the application}
TheDir := ExtractFilePath(ParamStr(0));
@ -140,7 +140,7 @@ function TfrmMain.GetSNData(var S : string) : integer;
var
TC : TCode;
SNC : string;
L : longint;
L : longint = 0;
Key : TKey;
begin
Application.CreateForm(TSNEntryDlg, SNEntryDlg);
@ -163,8 +163,7 @@ begin
OgSerialNumberCode1.Modifier := SNEntryDlg.ModString.Text;
HexToBuffer(SNEntryDlg.ModString.Text, L, SizeOf(L));
HexToBuffer(SNEntryDlg.CodeText.Text, TC, SizeOf(TCode));
HexToBuffer(SNEntryDlg.CodeText.Text, TC{%H-}, SizeOf(TCode));
ApplyModifierToKeyPrim(L, Key, SizeOf(TKey));
if not (IsSerialNumberCodeValid(Key, TC)) then begin