Skip to content

Commit dc489d3

Browse files
committed
Delphi 10.4 Sydney packages
1 parent 2e0bc47 commit dc489d3

12 files changed

+3574
-108
lines changed

DBParsers.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ function TExpressionParser.VarResult :Boolean;
547547
var
548548
pfdStart, pfd: PAnsiChar;
549549
begin
550-
pfdStart := @FilterData[0];
550+
pfdStart := Addr(FilterData[0]);
551551
pfd := pfdStart;
552552
iLiteralStart := PWord(@pfd[8])^;
553553
Inc(pfd, 10);

Editors/RegFIBPlusEditors.pas

Lines changed: 1 addition & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -389,73 +389,6 @@ procedure TFIBSQLMemo.SetReadOnly(Value: boolean);
389389
inherited ReadOnly:=Value
390390
end;
391391

392-
393-
{$ifndef internal}
394-
procedure RegisterModule;
395-
const
396-
RegKey = 'Devrace\FibPlus\7.2';
397-
var
398-
Crypt: TDev_class8; //Tea
399-
Crypt2: TDev_class10; //Ice
400-
tempkey: HKey;
401-
keyClass: array[0..256] of AnsiChar;
402-
KeySize: DWord;
403-
work, Hardware: AnsiString;
404-
I: Integer;
405-
info, username, key: Ansistring;
406-
t: AnsiChar;
407-
begin
408-
DemoTimer := nil;
409-
CheckLicense := nil;
410-
NotifierIndex := -MAXWORD;
411-
412-
LicensedTo := 'Craked version';
413-
Crypt := TDev_class8.Create(nil);
414-
Crypt2 := TDev_class10.Create(nil);
415-
try
416-
if RegOpenKeyEx(HKEY_CURRENT_USER, 'Software\' + RegKey, 0, KEY_QUERY_VALUE, tempkey) = ERROR_SUCCESS then
417-
begin
418-
KeySize := 256;
419-
RegQueryInfoKeyA(tempkey, keyClass, @KeySize, nil, nil, nil, nil, nil, nil, nil, nil, nil);
420-
RegCloseKey(TempKey);
421-
Hardware := GetHardID;
422-
Hardware := Hardware + StringOfChar('\', Length(RegKey) - Length(Hardware));
423-
work := '';
424-
for I := 1 to Length(RegKey) do
425-
work := work + AnsiChar(Byte(Ord(Hardware[i]) + Ord(RegKey[i])));
426-
427-
crypt.InitStr(work, TDev_hash2); //MD5
428-
info := crypt.WorkDSt(keyclass);
429-
username := Copy(info, 1, Pos(#1, Info) - 1);
430-
LicensedTo := username;
431-
key := copy(info, Pos(#1, Info) + 1, Length(info));
432-
k := key;
433-
crypt2.InitStr(username, TDev_hash3); //RipeMD-128
434-
key := key + '==';
435-
key := Crypt2.WorkDSt(key);
436-
437-
t := key[1]; key[1] := key[30]; key[30] := t;
438-
t := key[3]; key[3] := key[32]; key[32] := t;
439-
t := key[6]; key[6] := key[35]; key[35] := t;
440-
t := key[8]; key[8] := key[37]; key[37] := t;
441-
t := key[10]; key[10] := key[39]; key[39] := t;
442-
t := key[12]; key[12] := key[41]; key[41] := t;
443-
t := key[14]; key[14] := key[43]; key[43] := t;
444-
445-
// MessageBoxa(0, PAnsiChar(key), PAnsiChar(username), mb_ok) ;
446-
CheckKeyAndDecrypt(PAnsiChar(key), PAnsiChar(username), False);
447-
;
448-
// k := key;
449-
end;
450-
finally
451-
Crypt.Burn;
452-
Crypt.Free;
453-
Crypt2.Burn;
454-
Crypt2.Free;
455-
end;
456-
end;
457-
{$endif}
458-
459392
{$ifndef internal}
460393
{ TMenuIOTACleverFilter }
461394

@@ -587,7 +520,7 @@ procedure TFIBSQLMemo.SetBeforePropCall(Event: TiBeforeProposalCall);
587520

588521
function TFIBSQLMemo.GetPosInText: Integer;
589522
begin
590-
523+
Result := SelStart;
591524
end;
592525

593526
initialization

Editors/pFIBComponentEditors.pas

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ procedure TpFIBDatabaseEditor.ExecuteVerb(Index: Integer);
266266
var
267267
db:IFIBConnect;
268268
Script:TStrings;
269-
Connected:Boolean;
269+
// Connected:Boolean;
270270
begin
271271
if ObjSupports(Component,IFIBConnect,db) then
272272
case Index of
@@ -329,7 +329,7 @@ procedure TpFIBDatabaseEditor.ExecuteVerb(Index: Integer);
329329
begin
330330
Script:=TStringList.Create;
331331
try
332-
Connected:=GetPropValue(Component,'Connected',False);
332+
// Connected:=GetPropValue(Component,'Connected',False);
333333

334334
Script.Add('/***************************************');
335335
Script.Add(' FIBPlus repository tables ');
@@ -1371,14 +1371,15 @@ procedure TpFIBDeltaReceiverEditor.ExecuteVerb(Index: Integer);
13711371
TableName:string;
13721372
DelTableName,TriggerName:string;
13731373
DB:TObject;
1374-
Qry:TComponent;
1374+
// Qry:TComponent;
13751375
Trans :TObject;
13761376
iQry:IFIBQuery;
1377-
trActive:boolean;
1378-
ErrMessage:string;
1377+
// trActive:boolean;
1378+
// ErrMessage:string;
13791379
Script:TStrings;
13801380
Stringer:IFIBStringer;
1381-
clExp:IFIBClassesExporter;
1381+
clExp:IFIBClassesExporter;
1382+
{
13821383
procedure ExecStatement(const SQL:string);
13831384
begin
13841385
AssignStringsToProp(Qry,'SQL',SQL);
@@ -1389,6 +1390,7 @@ procedure ExecStatement(const SQL:string);
13891390
ErrMessage:=ErrMessage+#13#10+E.Message
13901391
end;
13911392
end;
1393+
}
13921394

13931395
begin
13941396
Trans:=GetObjectProp(Component,'Transaction');
@@ -1545,10 +1547,10 @@ procedure ExecStatement(const SQL:string);
15451547
end;
15461548
finally
15471549
Script.Free;
1548-
if not trActive then
1549-
SetPropValue(Trans,'Active',False);
1550+
// if not trActive then
1551+
// SetPropValue(Trans,'Active',False);
15501552
iQry:=nil;
1551-
Qry.Free;
1553+
// Qry.Free;
15521554
end
15531555
end;
15541556

Editors/pFIBSyntaxMemo.pas

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
interface
1515

16+
{$I ..\FIBPlus.inc}
17+
1618
{$IFDEF VER130}
1719
{$IFDEF BCB} // C++Buider 5.0
1820
{$ObjExportAll on}
@@ -178,35 +180,7 @@ interface
178180
{$WARNINGS OFF}
179181
{$ENDIF}
180182

181-
{$IFDEF VER300}
182-
{$DEFINE D23}
183-
{$ENDIF}
184-
185-
{$IFDEF VER310}
186-
{$DEFINE D24}
187-
{$ENDIF}
188-
189-
{$IFDEF VER320}
190-
{$DEFINE D25}
191-
{$ENDIF}
192-
193-
{$IFDEF VER330}
194-
{$DEFINE D26}
195-
{$ENDIF}
196-
197-
{$IFDEF D26}
198-
{$DEFINE D25}
199-
{$ENDIF}
200-
201-
{$IFDEF D25}
202-
{$DEFINE D24}
203-
{$ENDIF}
204-
205-
{$IFDEF D24}
206-
{$DEFINE D23}
207-
{$ENDIF}
208-
209-
{$IFDEF D23}
183+
{$IFDEF D_23}
210184
{$DEFINE D4+}
211185
{$DEFINE D5+}
212186
{$DEFINE D6+}
@@ -226,7 +200,6 @@ interface
226200
{$WARNINGS OFF}
227201
{$ENDIF}
228202

229-
{$I ..\FIBPlus.inc}
230203
{$UNDEF UNICODE}
231204

232205
uses

FIBPlus.inc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,17 @@
169169
{$DEFINE D_26}
170170
{$ENDIF}
171171

172+
// DX10.4
173+
{$IFDEF VER340}
174+
{$DEFINE D_27}
175+
{$ENDIF}
176+
172177
//---------------------------------
173178

179+
{$IFDEF D_27}
180+
{$DEFINE D_26}
181+
{$ENDIF}
182+
174183
{$IFDEF D_26}
175184
{$DEFINE D_25}
176185
{$ENDIF}

Packages/DclFIBPlus_D27.dpk

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package DclFIBPlus_D27;
2+
3+
{$R *.res}
4+
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
5+
{$ALIGN 8}
6+
{$ASSERTIONS ON}
7+
{$BOOLEVAL OFF}
8+
{$DEBUGINFO OFF}
9+
{$EXTENDEDSYNTAX ON}
10+
{$IMPORTEDDATA ON}
11+
{$IOCHECKS ON}
12+
{$LOCALSYMBOLS ON}
13+
{$LONGSTRINGS ON}
14+
{$OPENSTRINGS ON}
15+
{$OPTIMIZATION OFF}
16+
{$OVERFLOWCHECKS OFF}
17+
{$RANGECHECKS OFF}
18+
{$REFERENCEINFO ON}
19+
{$SAFEDIVIDE OFF}
20+
{$STACKFRAMES ON}
21+
{$TYPEDADDRESS OFF}
22+
{$VARSTRINGCHECKS ON}
23+
{$WRITEABLECONST OFF}
24+
{$MINENUMSIZE 1}
25+
{$IMAGEBASE $400000}
26+
{$DEFINE DEBUG}
27+
{$ENDIF IMPLICITBUILDING}
28+
{$DESCRIPTION 'FibPlus Access Components'}
29+
{$DESIGNONLY}
30+
{$IMPLICITBUILD ON}
31+
32+
requires
33+
FibPlus_D27;
34+
35+
contains
36+
RegFIBPlus in '..\RegFIBPlus.pas';
37+
38+
end.

0 commit comments

Comments
 (0)