diff options
| -rw-r--r-- | fcl/db/dbase/dbf.pas | 2 | ||||
| -rw-r--r-- | fcl/db/dbase/dbf_common.pas | 2 | ||||
| -rw-r--r-- | fcl/db/dbase/dbf_dbffile.pas | 2 | ||||
| -rw-r--r-- | fcl/db/dbase/dbf_idxfile.pas | 4 | ||||
| -rw-r--r-- | fcl/db/dbase/history.txt | 6 |
5 files changed, 11 insertions, 5 deletions
diff --git a/fcl/db/dbase/dbf.pas b/fcl/db/dbase/dbf.pas index 61bb514a49..1b8ab4f785 100644 --- a/fcl/db/dbase/dbf.pas +++ b/fcl/db/dbase/dbf.pas @@ -1442,7 +1442,7 @@ begin FDbfFile.DbfVersion := TableLevelToDbfVersion(FTableLevel); FDbfFile.FileLangID := FLanguageID; FDbfFile.Open; - FDbfFile.FinishCreate(DbfFieldDefs, 512); + FDbfFile.FinishCreate(ADbfFieldDefs, 512); // if creating memory table, copy stream pointer if FStorage = stoMemory then diff --git a/fcl/db/dbase/dbf_common.pas b/fcl/db/dbase/dbf_common.pas index 437babcf12..e6da86e1a9 100644 --- a/fcl/db/dbase/dbf_common.pas +++ b/fcl/db/dbase/dbf_common.pas @@ -17,7 +17,7 @@ uses const TDBF_MAJOR_VERSION = 6; - TDBF_MINOR_VERSION = 47; + TDBF_MINOR_VERSION = 48; TDBF_SUB_MINOR_VERSION = 0; TDBF_TABLELEVEL_FOXPRO = 25; diff --git a/fcl/db/dbase/dbf_dbffile.pas b/fcl/db/dbase/dbf_dbffile.pas index 531d03f560..e6a022cb03 100644 --- a/fcl/db/dbase/dbf_dbffile.pas +++ b/fcl/db/dbase/dbf_dbffile.pas @@ -722,7 +722,7 @@ begin // update header PDbfHdr(Header)^.RecordSize := lFieldOffset; - PDbfHdr(Header)^.FullHdrSize := HeaderSize + RecordSize * FieldDefs.Count + 1; + PDbfHdr(Header)^.FullHdrSize := HeaderSize + RecordSize * AFieldDefs.Count + 1; // add empty "back-link" info, whatever it is: { A 263-byte range that contains the backlink, which is the relative path of an associated database (.dbc) file, information. If the first byte is 0x00, diff --git a/fcl/db/dbase/dbf_idxfile.pas b/fcl/db/dbase/dbf_idxfile.pas index 357592b599..0f3e111a4c 100644 --- a/fcl/db/dbase/dbf_idxfile.pas +++ b/fcl/db/dbase/dbf_idxfile.pas @@ -944,8 +944,8 @@ begin PChar(keyData)^ := #0; { else - if Key <> nil then - PDouble(keyData)^ := PDouble(Key)^ + if AKey <> nil then + PDouble(keyData)^ := PDouble(AKey)^ else PDouble(keyData)^ := 0.0; } diff --git a/fcl/db/dbase/history.txt b/fcl/db/dbase/history.txt index 279e568aa5..3a308217ec 100644 --- a/fcl/db/dbase/history.txt +++ b/fcl/db/dbase/history.txt @@ -33,6 +33,12 @@ BUGS & WARNINGS ------------------------ +V6.4.8 + +- remove duplicate names, may cause ambiguity + + +------------------------ V6.4.7 - fixed: 64bit compatibility |