+ Version 6.4.5

git-svn-id: trunk@626 -

fcl/db/dbase/dbf.pas

@@ -4,19 +4,19 @@ unit dbf;
 
 interface
 
-{$I Dbf_Common.inc}
+{$I dbf_common.inc}
 
 uses
   Classes,
   Db,
-  Dbf_Common,
-  Dbf_DbfFile,
-  Dbf_Parser,
-  Dbf_PrsDef,
-  Dbf_Cursor,
-  Dbf_Fields,
-  Dbf_PgFile,
-  Dbf_IdxFile;
+  dbf_common,
+  dbf_dbffile,
+  dbf_parser,
+  dbf_prsdef,
+  dbf_cursor,
+  dbf_fields,
+  dbf_pgfile,
+  dbf_idxfile;
 // If you got a compilation error here or asking for dsgnintf.pas, then just add
 // this file in your project:
 // dsgnintf.pas in 'C: \Program Files\Borland\Delphi5\Source\Toolsapi\dsgnintf.pas'
@@ -232,11 +232,11 @@ type
     function  GetBookmarkFlag(Buffer: PChar): TBookmarkFlag; override; {virtual abstract}
     function  GetRecord(Buffer: PChar; GetMode: TGetMode; DoCheck: Boolean): TGetResult; override; {virtual abstract}
     function  GetRecordSize: Word; override; {virtual abstract}
-    procedure InternalAddRecord(Buffer: Pointer; Append: Boolean); override; {virtual abstract}
+    procedure InternalAddRecord(Buffer: Pointer; AAppend: Boolean); override; {virtual abstract}
     procedure InternalClose; override; {virtual abstract}
     procedure InternalDelete; override; {virtual abstract}
     procedure InternalFirst; override; {virtual abstract}
-    procedure InternalGotoBookmark(Bookmark: Pointer); override; {virtual abstract}
+    procedure InternalGotoBookmark(ABookmark: Pointer); override; {virtual abstract}
     procedure InternalHandleException; override; {virtual abstract}
     procedure InternalInitFieldDefs; override; {virtual abstract}
     procedure InternalInitRecord(Buffer: PChar); override; {virtual abstract}
@@ -245,7 +245,9 @@ type
     procedure InternalEdit; override; {virtual}
     procedure InternalCancel; override; {virtual}
 {$ifndef FPC}
+{$ifndef DELPHI_3}
     procedure InternalInsert; override; {virtual}
+{$endif}
 {$endif}
     procedure InternalPost; override; {virtual abstract}
     procedure InternalSetToRecord(Buffer: PChar); override; {virtual abstract}
@@ -309,9 +311,9 @@ type
 
     // index support (use same syntax as ttable but is not related)
 {$ifdef SUPPORT_DEFAULT_PARAMS}
-    procedure AddIndex(const AIndexName, Fields: String; Options: TIndexOptions; const DescFields: String='');
+    procedure AddIndex(const AIndexName, AFields: String; Options: TIndexOptions; const DescFields: String='');
 {$else}
-    procedure AddIndex(const AIndexName, Fields: String; Options: TIndexOptions);
+    procedure AddIndex(const AIndexName, AFields: String; Options: TIndexOptions);
 {$endif}
     procedure RegenerateIndexes;
 
@@ -398,7 +400,8 @@ type
     property StoreDefs: Boolean read FStoreDefs write FStoreDefs default False;
     property TableName: string read FTableName write SetTableName;
     property TableLevel: Integer read FTableLevel write SetTableLevel;
-    property UseFloatFields: Boolean read FUseFloatFields write FUseFloatFields default true;
+    property UseFloatFields: Boolean read FUseFloatFields write FUseFloatFields;
+      (* default {$ifdef SUPPORT_INT64} false {$else} true {$endif}; *)
     property Version: string read GetVersion write SetVersion stored false;
     property BeforeAutoCreate: TBeforeAutoCreateEvent read FBeforeAutoCreate write FBeforeAutoCreate;
     property OnCompareRecord: TNotifyEvent read FOnCompareRecord write FOnCompareRecord;
@@ -455,16 +458,16 @@ uses
 {$else}
 {$ifdef KYLIX}
   Libc,
-{$endif}
+{$endif}  
   Types,
-  Dbf_Wtil,
+  dbf_wtil,
 {$endif}
 {$ifdef DELPHI_6}
   Variants,
 {$endif}
-  Dbf_IdxCur,
-  Dbf_Memo,
-  Dbf_Str;
+  dbf_idxcur,
+  dbf_memo,
+  dbf_str;
 
 {$ifdef FPC}
 const
@@ -548,7 +551,7 @@ begin
     Translate(true);
     Dbf.FDbfFile.MemoFile.WriteMemo(FMemoRecNo, FReadSize, Self);
     Dbf.FDbfFile.SetFieldData(FBlobField.FieldNo-1, ftInteger, @FMemoRecNo,
-      @pDbfRecord(TDbf(FBlobField.DataSet).ActiveBuffer).DeletedFlag);
+      @pDbfRecord(TDbf(FBlobField.DataSet).ActiveBuffer)^.DeletedFlag);
     FDirty := false;
   end;
 end;
@@ -621,6 +624,7 @@ begin
   FReadOnly := false;
   FExclusive := false;
   FUseFloatFields := true;
+  //FUseFloatFields := {$ifdef SUPPORT_INT64} false {$else} true {$endif};
   FDisableResyncOnPost := false;
   FTempExclusive := false;
   FCopyDateTimeAsString := false;
@@ -659,7 +663,7 @@ end;
 
 procedure TDbf.FreeRecordBuffer(var Buffer: PChar); {override virtual abstract from TDataset}
 begin
-  FreeMem(Buffer);
+  FreeMemAndNil(Pointer(Buffer));
 end;
 
 procedure TDbf.GetBookmarkData(Buffer: PChar; Data: Pointer); {override virtual abstract from TDataset}
@@ -676,14 +680,14 @@ function TDbf.GetCurrentBuffer: PChar;
 begin
   case State of
     dsFilter:     Result := FFilterBuffer;
-    dsCalcFields: Result := @(pDbfRecord(CalcBuffer).DeletedFlag);
+    dsCalcFields: Result := @(pDbfRecord(CalcBuffer)^.DeletedFlag);
 //    dsSetKey:     Result := FKeyBuffer;     // TO BE Implemented
   else
     if IsEmpty then
     begin
       Result := nil;
     end else begin
-      Result := @(pDbfRecord(ActiveBuffer).DeletedFlag);
+      Result := @(pDbfRecord(ActiveBuffer)^.DeletedFlag);
     end;
   end;
 end;
@@ -811,8 +815,8 @@ begin
       begin
         Result := grError;
       end else begin
-        FDbfFile.ReadRecord(lPhysicalRecNo, @pRecord.DeletedFlag);
-        acceptable := (FShowDeleted or (pRecord.DeletedFlag <> '*'))
+        FDbfFile.ReadRecord(lPhysicalRecNo, @pRecord^.DeletedFlag);
+        acceptable := (FShowDeleted or (pRecord^.DeletedFlag <> '*'))
       end;
     end;
 
@@ -820,7 +824,7 @@ begin
     begin
       if Filtered or FFindRecordFilter then
       begin
-        FFilterBuffer := @pRecord.DeletedFlag;
+        FFilterBuffer := @pRecord^.DeletedFlag;
         SaveState := SetTempState(dsFilter);
         DoFilterRecord(acceptable);
         RestoreState(SaveState);
@@ -833,12 +837,12 @@ begin
 
   if (Result = grOK) and not FFindRecordFilter then
   begin
-    pRecord.BookmarkData.PhysicalRecNo := FCursor.PhysicalRecNo;
-    pRecord.BookmarkFlag := bfCurrent;
-    pRecord.SequentialRecNo := FCursor.SequentialRecNo;
+    pRecord^.BookmarkData.PhysicalRecNo := FCursor.PhysicalRecNo;
+    pRecord^.BookmarkFlag := bfCurrent;
+    pRecord^.SequentialRecNo := FCursor.SequentialRecNo;
     GetCalcFields(Buffer);
   end else begin
-    pRecord.BookmarkData.PhysicalRecNo := -1;
+    pRecord^.BookmarkData.PhysicalRecNo := -1;
   end;
 end;
 
@@ -847,7 +851,7 @@ begin
   Result := FDbfFile.RecordSize;
 end;
 
-procedure TDbf.InternalAddRecord(Buffer: Pointer; Append: Boolean); {override virtual abstract from TDataset}
+procedure TDbf.InternalAddRecord(Buffer: Pointer; AAppend: Boolean); {override virtual abstract from TDataset}
   // this function is called from TDataSet.InsertRecord and TDataSet.AppendRecord
   // goal: add record with Edit...Set Fields...Post all in one step
 var
@@ -859,7 +863,7 @@ begin
 
   // we can not insert records in DBF files, only append
   // ignore Append parameter
-  newRecord := FDbfFile.Insert(@pRecord.DeletedFlag);
+  newRecord := FDbfFile.Insert(@pRecord^.DeletedFlag);
   if newRecord > 0 then
     FCursor.PhysicalRecNo := newRecord;
 
@@ -898,8 +902,8 @@ begin
   if FBlobStreams <> nil then
   begin
     for I := 0 to Pred(FieldCount) do
-      if FBlobStreams[I] <> nil then
-        FBlobStreams[I].Free;
+      if FBlobStreams^[I] <> nil then
+        FBlobStreams^[I].Free;
     FreeMemAndNil(Pointer(FBlobStreams));
   end;
   FreeRecordBuffer(FTempBuffer);
@@ -924,8 +928,8 @@ var
 begin
   // cancel blobs
   for I := 0 to Pred(FieldCount) do
-    if Assigned(FBlobStreams[I]) then
-      FBlobStreams[I].Cancel;
+    if Assigned(FBlobStreams^[I]) then
+      FBlobStreams^[I].Cancel;
   // if we have locked a record, unlock it
   if FEditingRecNo >= 0 then
   begin
@@ -939,15 +943,16 @@ var
   lRecord: pDbfRecord;
 begin
   // start editing
-  Edit;
+  InternalEdit;
+  SetState(dsEdit);
   // get record pointer
   lRecord := pDbfRecord(ActiveBuffer);
   // flag we deleted this record
-  lRecord.DeletedFlag := '*';
+  lRecord^.DeletedFlag := '*';
   // notify indexes this record is deleted
-  FDbfFile.RecordDeleted(FEditingRecNo, @lRecord.DeletedFlag);
+  FDbfFile.RecordDeleted(FEditingRecNo, @lRecord^.DeletedFlag);
   // done!
-  Post;
+  InternalPost;
 end;
 
 procedure TDbf.InternalFirst; {override virtual abstract from TDataset}
@@ -955,9 +960,9 @@ begin
   FCursor.First;
 end;
 
-procedure TDbf.InternalGotoBookmark(Bookmark: Pointer); {override virtual abstract from TDataset}
+procedure TDbf.InternalGotoBookmark(ABookmark: Pointer); {override virtual abstract from TDataset}
 begin
-  with PBookmarkData(Bookmark)^ do
+  with PBookmarkData(ABookmark)^ do
   begin
     if (PhysicalRecNo = 0) then begin
       First;
@@ -1003,6 +1008,9 @@ begin
     else
       FieldDefs.Add(TempFieldDef.FieldName, TempFieldDef.FieldType, 0, false);
 
+    if TempFieldDef.FieldType = ftFloat then
+      FieldDefs[I].Precision := TempFieldDef.Precision;
+
 {$ifdef SUPPORT_FIELDDEF_ATTRIBUTES}
     // AutoInc fields are readonly
     if TempFieldDef.FieldType = ftAutoInc then
@@ -1078,11 +1086,11 @@ var
   pRecord: pDbfRecord;
 begin
   pRecord := pDbfRecord(Buffer);
-  pRecord.BookmarkData.PhysicalRecNo := 0;
-  pRecord.BookmarkFlag := bfCurrent;
-  pRecord.SequentialRecNo := 0;
+  pRecord^.BookmarkData.PhysicalRecNo := 0;
+  pRecord^.BookmarkFlag := bfCurrent;
+  pRecord^.SequentialRecNo := 0;
 // Init Record with zero and set autoinc field with next value
-  FDbfFile.InitRecord(@pRecord.DeletedFlag);
+  FDbfFile.InitRecord(@pRecord^.DeletedFlag);
 end;
 
 procedure TDbf.InternalLast; {override virtual abstract from TDataset}
@@ -1092,17 +1100,17 @@ end;
 
 procedure TDbf.DetermineTranslationMode;
 var
-  codePage: Cardinal;
+  lCodePage: Cardinal;
 begin
-  codePage := FDbfFile.UseCodePage;
-  if codePage = GetACP then
+  lCodePage := FDbfFile.UseCodePage;
+  if lCodePage = GetACP then
     FTranslationMode := tmNoneNeeded
   else
-  if codePage = GetOEMCP then
+  if lCodePage = GetOEMCP then
     FTranslationMode := tmSimple
   // check if this code page, although non default, is installed
   else
-  if DbfGlobals.CodePageInstalled(codePage) then
+  if DbfGlobals.CodePageInstalled(lCodePage) then
     FTranslationMode := tmAdvanced
   else
     FTranslationMode := tmNoneAvailable;
@@ -1123,8 +1131,8 @@ begin
   FreeAndNil(FDbfFile);
 
   // does file not exist? -> create
-  if ((FStorage = stoFile) and
-        not FileExists(FAbsolutePath + FTableName) and
+  if ((FStorage = stoFile) and 
+        not FileExists(FAbsolutePath + FTableName) and 
         (FOpenMode in [omAutoCreate, omTemporary])) or
      ((FStorage = stoMemory) and (FUserStream = nil)) then
   begin
@@ -1142,10 +1150,10 @@ begin
   FDbfFile.Open;
 
   // fail open?
-{$ifndef FPC}
+{$ifndef FPC}  
   if FDbfFile.ForceClose then
     Abort;
-{$endif}
+{$endif}    
 
   // determine dbf version
   case FDbfFile.DbfVersion of
@@ -1187,7 +1195,7 @@ begin
   // create array of blobstreams to store memo's in. each field is a possible blob
   GetMem(FBlobStreams, FieldCount * SizeOf(TDbfBlobStream));
   for I := 0 to Pred(FieldCount) do
-    FBlobStreams[I] := nil;
+    FBlobStreams^[I] := nil;
 
   // check codepage settings
   DetermineTranslationMode;
@@ -1283,20 +1291,22 @@ begin
   // reread blobs, execute cancel -> clears remembered memo pageno,
   // causing it to reread the memo contents
   for I := 0 to Pred(FieldCount) do
-    if Assigned(FBlobStreams[I]) then
-      FBlobStreams[I].Cancel;
+    if Assigned(FBlobStreams^[I]) then
+      FBlobStreams^[I].Cancel;
   // try to lock this record
-  FDbfFile.LockRecord(FEditingRecNo, @pDbfRecord(ActiveBuffer).DeletedFlag);
+  FDbfFile.LockRecord(FEditingRecNo, @pDbfRecord(ActiveBuffer)^.DeletedFlag);
   // succeeded!
 end;
 
 {$ifndef FPC}
+{$ifndef DELPHI_3}
 
 procedure TDbf.InternalInsert; {override virtual from TDataset}
 begin
   CursorPosChanged;
 end;
 
+{$endif}
 {$endif}
 
 procedure TDbf.InternalPost; {override virtual abstract from TDataset}
@@ -1308,17 +1318,17 @@ begin
   pRecord := pDbfRecord(ActiveBuffer);
   // commit blobs
   for I := 0 to Pred(FieldCount) do
-    if Assigned(FBlobStreams[I]) then
-      FBlobStreams[I].Commit;
+    if Assigned(FBlobStreams^[I]) then
+      FBlobStreams^[I].Commit;
   if State = dsEdit then
   begin
     // write changes
-    FDbfFile.UnlockRecord(FEditingRecNo, @pRecord.DeletedFlag);
+    FDbfFile.UnlockRecord(FEditingRecNo, @pRecord^.DeletedFlag);
     // not editing anymore
     FEditingRecNo := -1;
   end else begin
     // insert
-    newRecord := FDbfFile.Insert(@pRecord.DeletedFlag);
+    newRecord := FDbfFile.Insert(@pRecord^.DeletedFlag);
     if newRecord > 0 then
       FCursor.PhysicalRecNo := newRecord;
   end;
@@ -1395,7 +1405,7 @@ procedure TDbf.CreateTableEx(DbfFieldDefs: TDbfFieldDefs);
 var
   I: Integer;
   lIndex: TDbfIndexDef;
-  IndexName: string;
+  lIndexName: string;
   tempFieldDefs: Boolean;
 begin
   CheckInactive;
@@ -1447,8 +1457,8 @@ begin
       for I := 0 to FIndexDefs.Count-1 do
       begin
         lIndex := FIndexDefs.Items[I];
-        IndexName := ParseIndexName(lIndex.IndexFile);
-        FDbfFile.OpenIndex(IndexName, lIndex.SortField, true, lIndex.Options);
+        lIndexName := ParseIndexName(lIndex.IndexFile);
+        FDbfFile.OpenIndex(lIndexName, lIndex.SortField, true, lIndex.Options);
       end;
     except
       // dbf file created?
@@ -1569,6 +1579,7 @@ begin
   CheckBrowseMode;
   DoBeforeScroll;
   Result := false;
+  UpdateCursorPos;
   oldRecNo := RecNo;
   try
     FFindRecordFilter := true;
@@ -1583,9 +1594,13 @@ begin
   finally
     FFindRecordFilter := false;
     if not Result then
+    begin
       RecNo := oldRecNo;
-    CursorPosChanged;
-    Resync([]);
+    end else begin
+      CursorPosChanged;
+      Resync([]);
+      DoAfterScroll;
+    end;
   end;
 end;
 
@@ -1819,16 +1834,16 @@ begin
   // check if in editing mode if user wants to write
   if (Mode = bmWrite) or (Mode = bmReadWrite) then
     if not (State in [dsEdit, dsInsert]) then
-{$ifdef DELPHI_3}
+{$ifdef DELPHI_3}    
       DatabaseError(SNotEditing);
-{$else}
+{$else}    
       DatabaseError(SNotEditing, Self);
-{$endif}
+{$endif}      
   // already created a `placeholder' blob for this field?
   MemoFieldNo := Field.FieldNo - 1;
-  if FBlobStreams[MemoFieldNo] = nil then
-    FBlobStreams[MemoFieldNo] := TDbfBlobStream.Create(Field);
-  lBlob := FBlobStreams[MemoFieldNo].AddReference;
+  if FBlobStreams^[MemoFieldNo] = nil then
+    FBlobStreams^[MemoFieldNo] := TDbfBlobStream.Create(Field);
+  lBlob := FBlobStreams^[MemoFieldNo].AddReference;
   // update pageno of blob <-> location where to read/write in memofile
   if FDbfFile.GetFieldData(Field.FieldNo-1, ftInteger, GetCurrentBuffer, @MemoPageNo) then
   begin
@@ -1846,7 +1861,7 @@ begin
       lBlob.ReadSize := 0;
     end;
     lBlob.MemoRecNo := MemoPageNo;
-  end else
+  end else 
   if not lBlob.Dirty or (Mode = bmWrite) then
   begin
     // reading and memo is empty and not written yet, or rewriting
@@ -1855,7 +1870,7 @@ begin
     lBlob.MemoRecNo := 0;
   end;
   { this is a hack, we actually need to know per user who's modifying, and who is not }
-  { Mode is more like: the mode of the last "creation"
+  { Mode is more like: the mode of the last "creation" }
   { if create/free is nested, then everything will be alright, i think ;-) }
   lBlob.Mode := Mode;
   { this is a hack: we actually need to know per user what it's position is }
@@ -1929,11 +1944,11 @@ end;
 
 procedure TDbf.ClearCalcFields(Buffer: PChar);
 var
-  RealBuffer, CalcBuffer: PChar;
+  lRealBuffer, lCalcBuffer: PChar;
 begin
-  RealBuffer := @pDbfRecord(Buffer).DeletedFlag;
-  CalcBuffer := RealBuffer + FDbfFile.RecordSize;
-  FillChar(CalcBuffer^, CalcFieldsSize, 0);
+  lRealBuffer := @pDbfRecord(Buffer)^.DeletedFlag;
+  lCalcBuffer := lRealBuffer + FDbfFile.RecordSize;
+  FillChar(lCalcBuffer^, CalcFieldsSize, 0);
 end;
 
 procedure TDbf.InternalSetToRecord(Buffer: PChar); {override virtual abstract from TDataset}
@@ -1943,11 +1958,11 @@ begin
   if Buffer <> nil then
   begin
     pRecord := pDbfRecord(Buffer);
-    if pRecord.BookmarkFlag = bfInserted then
+    if pRecord^.BookmarkFlag = bfInserted then
     begin
       // do what ???
     end else begin
-      FCursor.SequentialRecNo := pRecord.SequentialRecNo;
+      FCursor.SequentialRecNo := pRecord^.SequentialRecNo;
     end;
   end;
 end;
@@ -1980,11 +1995,11 @@ begin
   if (Field.FieldNo >= 0) then
   begin
     pRecord := pDbfRecord(ActiveBuffer);
-    dst := @pRecord.DeletedFlag;
+    dst := @pRecord^.DeletedFlag;
     FDbfFile.SetFieldData(Field.FieldNo - 1,Field.DataType,Buffer,Dst);
   end else begin    { ***** fkCalculated, fkLookup ***** }
     pRecord := pDbfRecord(CalcBuffer);
-    Dst := @pRecord.DeletedFlag;
+    Dst := @pRecord^.DeletedFlag;
     Inc(PChar(Dst), RecordSize + Field.Offset);
 //    Boolean(dst^) := LongBool(Buffer);
 //    if Boolean(dst^) then begin
@@ -2012,7 +2027,7 @@ begin
 
   // check if FCursor open
   if FCursor = nil then
-    exit;
+    exit; 
 
   // store current position
   prevRecNo := FCursor.SequentialRecNo;
@@ -2124,7 +2139,7 @@ begin
   inherited;
 
   // refilter dataset if filtered
-  if (FDbfFile <> nil) and Filtered then Resync([]);
+  if (FDbfFile <> nil) and Filtered then Refresh;
 end;
 
 procedure TDbf.SetFiltered(Value: Boolean); {override;}
@@ -2137,11 +2152,7 @@ begin
 
   // only refresh if active
   if FCursor <> nil then
-  begin
-    UpdateCursorPos;
-    CursorPosChanged;
-    Resync([]);
-  end;
+    Refresh;
 end;
 
 procedure TDbf.SetFilePath(const Value: string);
@@ -2156,7 +2167,7 @@ begin
   begin
     FAbsolutePath := IncludeTrailingPathDelimiter(Value);
   end else begin
-    FAbsolutePath := GetCompletePath(DbfBasePath, FRelativePath);
+    FAbsolutePath := GetCompletePath(DbfBasePath(), FRelativePath);
   end;
 end;
 
@@ -2184,7 +2195,7 @@ end;
 procedure TDbf.SetLanguageID(NewID: Byte);
 begin
   CheckInactive;
-
+  
   FLanguageID := NewID;
 end;
 
@@ -2252,16 +2263,16 @@ begin
 end;
 
 {$ifdef SUPPORT_DEFAULT_PARAMS}
-procedure TDbf.AddIndex(const AIndexName, Fields: String; Options: TIndexOptions; const DescFields: String='');
+procedure TDbf.AddIndex(const AIndexName, AFields: String; Options: TIndexOptions; const DescFields: String='');
 {$else}
-procedure TDbf.AddIndex(const AIndexName, Fields: String; Options: TIndexOptions);
+procedure TDbf.AddIndex(const AIndexName, AFields: String; Options: TIndexOptions);
 {$endif}
 var
   lIndexFileName: string;
 begin
   CheckActive;
   lIndexFileName := ParseIndexName(AIndexName);
-  FDbfFile.OpenIndex(lIndexFileName, Fields, true, Options);
+  FDbfFile.OpenIndex(lIndexFileName, AFields, true, Options);
 
   // refresh our indexdefs
   InternalInitFieldDefs;
@@ -2269,7 +2280,7 @@ end;
 
 procedure TDbf.SetIndexName(AIndexName: string);
 var
-  RecNo: Integer;
+  lRecNo: Integer;
 begin
   FIndexName := AIndexName;
   if FDbfFile = nil then
@@ -2278,13 +2289,13 @@ begin
   // get accompanying index file
   AIndexName := ParseIndexName(Trim(AIndexName));
   FIndexFile := FDbfFile.GetIndexByName(AIndexName);
-  // store current recno
+  // store current lRecNo
   if FCursor = nil then
   begin
-    RecNo := 1;
+    lRecNo := 1;
   end else begin
     UpdateCursorPos;
-    RecNo := FCursor.PhysicalRecNo;
+    lRecNo := FCursor.PhysicalRecNo;
   end;
   // select new cursor
   FreeAndNil(FCursor);
@@ -2299,8 +2310,8 @@ begin
     FCursor := TDbfCursor.Create(FDbfFile);
     FIndexName := EmptyStr;
   end;
-  // reset previous recno
-  FCursor.PhysicalRecNo := RecNo;
+  // reset previous lRecNo
+  FCursor.PhysicalRecNo := lRecNo;
   // refresh records
   if State = dsBrowse then
     Resync([]);
@@ -2384,7 +2395,7 @@ var
   I: Integer;
 begin
   Strings.Clear;
-  if FDbfFile = nil then
+  if FDbfFile <> nil then
   begin
     if dfDbf in Files then
       Strings.Add(FDbfFile.FileName);
@@ -2393,7 +2404,8 @@ begin
     if dfIndex in Files then
       for I := 0 to Pred(FDbfFile.IndexFiles.Count) do
         Strings.Add(TPagedFile(FDbfFile.IndexFiles.Items[I]).FileName);
-  end;
+  end else
+    Strings.Add(IncludeTrailingPathDelimiter(FilePathFull) + TableName);   
 end;
 
 {$ifdef SUPPORT_DEFAULT_PARAMS}
@@ -2404,20 +2416,12 @@ function TDbf.GetFileNamesString(Files: TDbfFileNames ): string;
 var
   sl: TStrings;
 begin
-  if Files = [dfDbf] then
-  begin
-    //even if closed!
-    // do it myself, since it is rather faster than the code below
-    Result := IncludeTrailingPathDelimiter(FilePathFull) + TableName;
-  end else begin
-    CheckActive;
-    sl := TStringList.Create;
-    try
-      GetFileNames(sl, Files);
-      Result := sl.Text;
-    finally
-      sl.Free
-    end;
+  sl := TStringList.Create;
+  try
+    GetFileNames(sl, Files);
+    Result := sl.Text;
+  finally
+    sl.Free;
   end;
 end;
 
@@ -2489,7 +2493,7 @@ begin
     FShowDeleted := Value;
     // refresh view only if active
     if FCursor <> nil then
-      Resync([]);
+      Refresh;
   end;
 end;
 
@@ -2527,7 +2531,7 @@ begin
   // disable current range if any
   FIndexFile.CancelRange;
   // reretrieve previous and next records
-  Resync([]);
+  Refresh;
 end;
 
 procedure TDbf.SetRangeBuffer(LowRange: PChar; HighRange: PChar);
@@ -2614,7 +2618,7 @@ begin
     Result := nil;
     exit;
   end;
-
+  
   Result := TIndexCursor(FCursor).IndexFile.PrepareKey(Buffer, BufferType);
 end;
 
@@ -2691,7 +2695,7 @@ begin
   fieldsVal := TIndexCursor(FCursor).IndexFile.PrepareKey(fieldsVal, FMasterLink.Parser.ResultType);
   SetRangeBuffer(fieldsVal, fieldsVal);
 end;
-
+    
 procedure TDbf.MasterChanged(Sender: TObject);
 begin
   CheckBrowseMode;
@@ -2719,7 +2723,7 @@ begin
     DatabaseError(SCircularDataLink);
 {$endif}
   end;
-{$endif}
+{$endif}  
   FMasterLink.DataSource := Value;
 end;
 
@@ -2876,7 +2880,7 @@ end;
 
 function TDbfMasterLink.GetFieldsVal: PChar;
 begin
-  Result := FParser.ExtractFromBuffer(@pDbfRecord(TDbf(DataSet).ActiveBuffer).DeletedFlag);
+  Result := FParser.ExtractFromBuffer(@pDbfRecord(TDbf(DataSet).ActiveBuffer)^.DeletedFlag);
 end;
 
 ////////////////////////////////////////////////////////////////////////////
@@ -2894,3 +2898,4 @@ initialization
   DbfBasePath := ApplicationPath;
 
 end.
+

fcl/db/dbase/dbf_common.pas

@@ -2,22 +2,22 @@ unit dbf_common;
 
 interface
 
-{$I Dbf_Common.inc}
+{$I dbf_common.inc}
 
 uses
   SysUtils, Classes, DB
 {$ifndef WIN32}
-  , Types, Dbf_Wtil
+  , Types, dbf_wtil
 {$ifdef KYLIX}
   , Libc
-{$endif}
+{$endif}  
 {$endif}
   ;
 
 
 const
   TDBF_MAJOR_VERSION      = 6;
-  TDBF_MINOR_VERSION      = 41;
+  TDBF_MINOR_VERSION      = 45;
   TDBF_SUB_MINOR_VERSION  = 0;
 
   TDBF_TABLELEVEL_FOXPRO = 25;
@@ -108,6 +108,13 @@ function TranslateString(FromCP, ToCP: Cardinal; Src, Dest: PChar; Length: Integ
 // Does not stop at null (#0) terminator!
 function MemScan(const Buffer: Pointer; Chr: Byte; Length: Integer): Pointer;
 
+// Delphi 3 does not have a Min function
+{$ifdef DELPHI_3}
+{$ifndef DELPHI_4}
+function Min(x, y: integer): integer;
+{$endif}
+{$endif}
+
 implementation
 
 {$ifdef WIN32}
@@ -167,44 +174,10 @@ end;
 procedure GetStrFromInt_Width(Val: Integer; const Width: Integer; const Dst: PChar; const PadChar: Char);
 var
   Temp: array[0..10] of Char;
-  I, J, K: Integer;
+  I, J: Integer;
   NegSign: boolean;
 begin
-  if Width <= 0 then
-    exit;
-
-  NegSign := Val < 0;
-  Val := Abs(Val);
-  // we'll have to store characters backwards first
-  I := 0;
-  J := 0;
-  repeat
-    Temp[I] := Chr((Val mod 10) + Ord('0'));
-    Val := Val div 10;
-    Inc(I);
-  until Val = 0;
-  // add sign
-  if NegSign then
-  begin
-    Dst[J] := '-';
-    Inc(J);
-  end;
-  // add spaces
-  for K := 0 to Width - I - J - 1 do
-  begin
-    Dst[J] := PadChar;
-    Inc(J);
-  end;
-  // if field too long, cut off
-  if J + I > Width then
-    I := Width - J;
-  // copy value, remember: stored backwards
-  repeat
-    Dst[J] := Temp[I-1];
-    Inc(J);
-    Dec(I);
-  until I = 0;
-  // done!
+  {$I getstrfromint.inc}
 end;
 
 {$ifdef SUPPORT_INT64}
@@ -212,44 +185,10 @@ end;
 procedure GetStrFromInt64_Width(Val: Int64; const Width: Integer; const Dst: PChar; const PadChar: Char);
 var
   Temp: array[0..19] of Char;
-  I, J, K: Integer;
+  I, J: Integer;
   NegSign: boolean;
 begin
-  if Width <= 0 then
-    exit;
-
-  NegSign := Val < 0;
-  Val := Abs(Val);
-  // we'll have to store characters backwards first
-  I := 0;
-  J := 0;
-  repeat
-    Temp[I] := Chr((Val mod 10) + Ord('0'));
-    Val := Val div 10;
-    inc(I);
-  until Val = 0;
-  // add sign
-  if NegSign then
-  begin
-    Dst[J] := '-';
-    inc(J);
-  end;
-  // add spaces
-  for K := 0 to Width - I - J - 1 do
-  begin
-    Dst[J] := PadChar;
-    inc(J);
-  end;
-  // if field too long, cut off
-  if J + I > Width then
-    I := Width - J;
-  // copy value, remember: stored backwards
-  repeat
-    Dst[J] := Temp[I-1];
-    inc(J);
-    dec(I);
-  until I = 0;
-  // done!
+  {$I getstrfromint.inc}
 end;
 
 {$endif}
@@ -403,19 +342,19 @@ end;
 
 {$ifdef USE_ASSEMBLER_486_UP}
 
-function SwapInt(const Value: Cardinal): Cardinal; register;
+function SwapInt(const Value: Cardinal): Cardinal; register; assembler;
 asm
   BSWAP EAX;
 end;
 
-procedure SwapInt64(Value {EAX}, Result {EDX}: Pointer); register;
+procedure SwapInt64(Value {EAX}, Result {EDX}: Pointer); register; assembler;
 asm
-  MOV ECX, dword ptr [EAX]
-  MOV EAX, dword ptr [EAX + 4]
-  BSWAP ECX
-  BSWAP EAX
-  MOV dword ptr [EDX+4], ECX
-  MOV dword ptr [EDX], EAX
+  MOV ECX, dword ptr [EAX] 
+  MOV EAX, dword ptr [EAX + 4] 
+  BSWAP ECX 
+  BSWAP EAX 
+  MOV dword ptr [EDX+4], ECX 
+  MOV dword ptr [EDX], EAX 
 end;
 
 {$else}
@@ -516,4 +455,21 @@ end;
 
 {$endif}
 
+{$ifdef DELPHI_3}
+{$ifndef DELPHI_4}
+
+function Min(x, y: integer): integer;
+begin
+  if x < y then
+    result := x
+  else
+    result := y;
+end;
+
+{$endif}
+{$endif}
+
 end.
+
+
+

fcl/db/dbase/dbf_cursor.pas

@@ -2,13 +2,13 @@ unit dbf_cursor;
 
 interface
 
-{$I Dbf_Common.inc}
+{$I dbf_common.inc}
 
 uses
   SysUtils,
   Classes,
-  Dbf_PgFile,
-  Dbf_Common;
+  dbf_pgfile,
+  dbf_common;
 
 type
 
@@ -61,3 +61,4 @@ begin
 end;
 
 end.
+

fcl/db/dbase/dbf_dbffile.pas

@@ -2,25 +2,28 @@ unit dbf_dbffile;
 
 interface
 
-{$I Dbf_Common.inc}
+{$I dbf_common.inc}
 
 uses
-  Classes, SysUtils, Math,
+  Classes, SysUtils,
+{$ifdef SUPPORT_MATH_UNIT}
+  Math,
+{$endif}
 {$ifdef WIN32}
   Windows,
 {$else}
 {$ifdef KYLIX}
-  Libc,
-{$endif}
-  Types, Dbf_Wtil,
+  Libc, 
+{$endif}  
+  Types, dbf_wtil,
 {$endif}
   Db,
-  Dbf_Common,
-  Dbf_Cursor,
-  Dbf_PgFile,
-  Dbf_Fields,
-  Dbf_Memo,
-  Dbf_IdxFile;
+  dbf_common,
+  dbf_cursor,
+  dbf_pgfile,
+  dbf_fields,
+  dbf_memo,
+  dbf_idxfile;
 
 //====================================================================
 //=== Dbf support (first part)
@@ -72,7 +75,7 @@ type
     function GetLanguageStr: string;
     function GetUseFloatFields: Boolean;
     procedure SetUseFloatFields(NewUse: Boolean);
-
+    
   protected
     procedure ConstructFieldDefs;
     procedure UpdateNullField(Buffer: Pointer; AFieldDef: TDbfFieldDef; Action: TUpdateNullField);
@@ -102,6 +105,7 @@ type
     procedure ApplyAutoIncToBuffer(DestBuf: PChar);     // dBase7 support. Writeback last next-autoinc value
     procedure FastPackTable;
     procedure RestructureTable(DbfFieldDefs: TDbfFieldDefs; Pack: Boolean);
+    procedure Rename(DestFileName: string; NewIndexFileNames: TStrings; DeleteFiles: boolean);
     function  GetFieldInfo(FieldName: string): TDbfFieldDef;
     function  GetFieldData(Column: Integer; DataType: TFieldType; Src,Dst: Pointer): Boolean;
     function  GetFieldDataFromDef(AFieldDef: TDbfFieldDef; DataType: TFieldType; Src, Dst: Pointer): Boolean;
@@ -163,7 +167,7 @@ type
     FDefaultCreateLangId: Byte;
     FUserName: string;
     FUserNameLen: DWORD;
-
+	
     function  GetDefaultCreateCodePage: Integer;
     procedure SetDefaultCreateCodePage(NewCodePage: Integer);
     procedure InitUserName;
@@ -194,12 +198,12 @@ uses
   BaseUnix,
 {$endif}
 {$endif}
-  Dbf_Str, Dbf_Lang;
+  dbf_str, dbf_lang;
 
 const
   sDBF_DEC_SEP = '.';
 
-{$I Dbf_Struct.inc}
+{$I dbf_struct.inc}
 
 //====================================================================
 // International separator
@@ -245,6 +249,9 @@ var
 begin
   // convert to temporary buffer
   resLen := FloatToText(@Buffer[0], Val, {$ifndef FPC_VERSION}fvExtended,{$endif} ffFixed, Size, Precision);
+  // prevent overflow in destination buffer
+  if resLen > Size then
+    resLen := Size;
   // null-terminate buffer
   Buffer[resLen] := #0;
   // we only have to convert if decimal separator different
@@ -358,7 +365,7 @@ begin
       //  $03,$8B dBaseIV/V       Header Byte $1d=$00, Float -> N($14.$05) DateTime D($08)
       //  $03,$F5 FoxPro Level 25 Header Byte $1d=$09, Float -> N($14.$05) DateTime D($08)
 
-      version := PDbfHdr(Header).VerDBF;
+      version := PDbfHdr(Header)^.VerDBF;
       case (version and $07) of
         $03:
           if LanguageID = 0 then
@@ -380,8 +387,8 @@ begin
         end;
       end;
       FFieldDefs.DbfVersion := FDbfVersion;
-      RecordSize := PDbfHdr(Header).RecordSize;
-      HeaderSize := PDbfHdr(Header).FullHdrSize;
+      RecordSize := PDbfHdr(Header)^.RecordSize;
+      HeaderSize := PDbfHdr(Header)^.FullHdrSize;
       if (HeaderSize = 0) or (RecordSize = 0) then
       begin
         HeaderSize := 0;
@@ -391,21 +398,21 @@ begin
         exit;
       end;
       // check if specified recordcount correct
-      if PDbfHdr(Header).RecordCount <> RecordCount then
+      if PDbfHdr(Header)^.RecordCount <> RecordCount then
       begin
         // This message was annoying
         // and was not understood by most people
         // ShowMessage('Invalid Record Count,'+^M+
         //             'RecordCount in Hdr : '+IntToStr(PDbfHdr(Header).RecordCount)+^M+
         //             'expected : '+IntToStr(RecordCount));
-        PDbfHdr(Header).RecordCount := RecordCount;
+        PDbfHdr(Header)^.RecordCount := RecordCount;
         WriteHeader;        // Correct it
       end;
       // determine codepage
       if FDbfVersion >= xBaseVII then
       begin
         // cache language str
-        LangStr := @PAfterHdrVII(PChar(Header) + SizeOf(rDbfHdr)).LanguageDriverName;
+        LangStr := @PAfterHdrVII(PChar(Header) + SizeOf(rDbfHdr))^.LanguageDriverName;
         // VdBase 7 Language strings
         //  'DBWIN...' -> Charset 1252 (ansi)
         //  'DB999...' -> Code page 999, 9 any digit
@@ -438,7 +445,7 @@ begin
         FFileLangId := GetLangId_From_LangName(LanguageStr);
       end else begin
         // FDbfVersion <= xBaseV
-        FFileLangId := PDbfHdr(Header).Language;
+        FFileLangId := PDbfHdr(Header)^.Language;
         FFileCodePage := LangId_To_CodePage[FFileLangId];
       end;
       // determine used codepage, if no codepage, then use default codepage
@@ -467,12 +474,12 @@ begin
         FMemoFile.Open;
         // set header blob flag corresponding to field list
         if FDbfVersion <> xFoxPro then
-          PDbfHdr(Header).VerDBF := PDbfHdr(Header).VerDBF or $80;
+          PDbfHdr(Header)^.VerDBF := PDbfHdr(Header)^.VerDBF or $80;
       end else
         if FDbfVersion <> xFoxPro then
-          PDbfHdr(Header).VerDBF := PDbfHdr(Header).VerDBF and $7F;
+          PDbfHdr(Header)^.VerDBF := PDbfHdr(Header)^.VerDBF and $7F;
       // check if mdx flagged
-      if (FDbfVersion <> xFoxPro) and (PDbfHdr(Header).MDXFlag <> 0) then
+      if (FDbfVersion <> xFoxPro) and (PDbfHdr(Header)^.MDXFlag <> 0) then
       begin
         // open mdx file if present
         lMdxFileName := ChangeFileExt(FileName, '.mdx');
@@ -503,7 +510,7 @@ begin
             FOnIndexMissing(deleteLink);
           // correct flag
           if deleteLink then
-            PDbfHdr(Header).MDXFlag := 0
+            PDbfHdr(Header)^.MDXFlag := 0
           else
             FForceClose := true;
         end;
@@ -527,7 +534,7 @@ begin
     for I := 0 to FIndexFiles.Count - 1 do
     begin
       TIndexFile(FIndexFiles.Items[I]).Close;
-      if FIndexFiles.Items[I] = FMdxFile then
+      if TIndexFile(FIndexFiles.Items[I]) = FMdxFile then
         MdxIndex := I;
     end;
     // free memo file if any
@@ -587,11 +594,11 @@ begin
       HeaderSize := SizeOf(rDbfHdr) + SizeOf(rAfterHdrVII);
       RecordSize := SizeOf(rFieldDescVII);
       FillChar(Header^, HeaderSize, #0);
-      PDbfHdr(Header).VerDBF := $04;
+      PDbfHdr(Header)^.VerDBF := $04;
       // write language string
       StrPLCopy(
-        @PAfterHdrVII(PChar(Header)+SizeOf(rDbfHdr)).LanguageDriverName[32],
-        ConstructLangName(FFileCodePage, lLocaleID, false),
+        @PAfterHdrVII(PChar(Header)+SizeOf(rDbfHdr))^.LanguageDriverName[32],
+        ConstructLangName(FFileCodePage, lLocaleID, false), 
         63-32);
       lFieldDescPtr := @lFieldDescVII;
     end else begin
@@ -601,14 +608,14 @@ begin
       FillChar(Header^, HeaderSize, #0);
       if FDbfVersion = xFoxPro then
       begin
-        PDbfHdr(Header).VerDBF := $02
+        PDbfHdr(Header)^.VerDBF := $02
       end else
-        PDbfHdr(Header).VerDBF := $03;
+        PDbfHdr(Header)^.VerDBF := $03;
       // standard language WE, dBase III no language support
       if FDbfVersion = xBaseIII then
-        PDbfHdr(Header).Language := 0
+        PDbfHdr(Header)^.Language := 0
       else
-        PDbfHdr(Header).Language := FFileLangId;
+        PDbfHdr(Header)^.Language := FFileLangId;
       // init field ptr
       lFieldDescPtr := @lFieldDescIII;
     end;
@@ -663,10 +670,10 @@ begin
         // TODO: bug-endianness
         if FDbfVersion = xFoxPro then
           lFieldDescIII.FieldOffset := lFieldOffset;
-        if (PDbfHdr(Header).VerDBF = $02) and (lFieldDef.NativeFieldType in ['0', 'Y', 'T', 'O', '+']) then
-          PDbfHdr(Header).VerDBF := $30;
-        if (PDbfHdr(Header).VerDBF = $30) and (lFieldDef.NativeFieldType = '+') then
-          PDbfHdr(Header).VerDBF := $31;
+        if (PDbfHdr(Header)^.VerDBF = $02) and (lFieldDef.NativeFieldType in ['0', 'Y', 'T', 'O', '+']) then
+          PDbfHdr(Header)^.VerDBF := $30;
+        if (PDbfHdr(Header)^.VerDBF = $30) and (lFieldDef.NativeFieldType = '+') then
+          PDbfHdr(Header)^.VerDBF := $31;
       end;
 
       // update our field list
@@ -688,32 +695,32 @@ begin
     if lHasBlob then
     begin
       if FDbfVersion = xBaseIII then
-        PDbfHdr(Header).VerDBF := PDbfHdr(Header).VerDBF or $80
+        PDbfHdr(Header)^.VerDBF := PDbfHdr(Header)^.VerDBF or $80
       else
       if FDbfVersion = xFoxPro then
       begin
-        if PDbfHdr(Header).VerDBF = $02 then
-          PDbfHdr(Header).VerDBF := $F5;
+        if PDbfHdr(Header)^.VerDBF = $02 then
+          PDbfHdr(Header)^.VerDBF := $F5;
       end else
-        PDbfHdr(Header).VerDBF := PDbfHdr(Header).VerDBF or $88;
+        PDbfHdr(Header)^.VerDBF := PDbfHdr(Header)^.VerDBF or $88;
     end;
 
     // update header
-    PDbfHdr(Header).RecordSize := lFieldOffset;
-    PDbfHdr(Header).FullHdrSize := HeaderSize + RecordSize * FieldDefs.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,
-      the file is not associated with a database. Therefore, database files always
+    PDbfHdr(Header)^.RecordSize := lFieldOffset;
+    PDbfHdr(Header)^.FullHdrSize := HeaderSize + RecordSize * FieldDefs.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, 
+      the file is not associated with a database. Therefore, database files always 
       contain 0x00. }
     if FDbfVersion = xFoxPro then
-      Inc(PDbfHdr(Header).FullHdrSize, 263);
+      Inc(PDbfHdr(Header)^.FullHdrSize, 263);
 
     // write dbf header to disk
     inherited WriteHeader;
   finally
-    RecordSize := PDbfHdr(Header).RecordSize;
-    HeaderSize := PDbfHdr(Header).FullHdrSize;
+    RecordSize := PDbfHdr(Header)^.RecordSize;
+    HeaderSize := PDbfHdr(Header)^.FullHdrSize;
 
     // write full header to disk (dbf+fields)
     WriteHeader;
@@ -738,14 +745,11 @@ end;
 function TDbfFile.HasBlob: Boolean;
 var
   I: Integer;
-  HasBlob: Boolean;
 begin
-  HasBlob := false;
+  Result := false;
   for I := 0 to FFieldDefs.Count-1 do
-  begin
-    if FFieldDefs.Items[I].IsBlob then HasBlob := true;
-  end;
-  Result := HasBlob;
+    if FFieldDefs.Items[I].IsBlob then 
+      Result := true;
 end;
 
 function TDbfFile.GetMemoExt: string;
@@ -761,7 +765,7 @@ begin
   // make recordcount zero
   RecordCount := 0;
   // update recordcount
-  PDbfHdr(Header).RecordCount := RecordCount;
+  PDbfHdr(Header)^.RecordCount := RecordCount;
   // update disk header
   WriteHeader;
   // update indexes
@@ -780,9 +784,9 @@ begin
   //FillHeader(0);
   lDataHdr := PDbfHdr(Header);
   GetLocalTime(SystemTime);
-  lDataHdr.Year := SystemTime.wYear - 1900;
-  lDataHdr.Month := SystemTime.wMonth;
-  lDataHdr.Day := SystemTime.wDay;
+  lDataHdr^.Year := SystemTime.wYear - 1900;
+  lDataHdr^.Month := SystemTime.wMonth;
+  lDataHdr^.Day := SystemTime.wDay;
 //  lDataHdr.RecordCount := RecordCount;
   inherited WriteHeader;
 
@@ -822,7 +826,7 @@ begin
   FLockField := nil;
   FNullField := nil;
   FAutoIncPresent := false;
-  lColumnCount := (PDbfHdr(Header).FullHdrSize - lHeaderSize) div lFieldSize;
+  lColumnCount := (PDbfHdr(Header)^.FullHdrSize - lHeaderSize) div lFieldSize;
   lFieldOffset := 1;
   lAutoInc := 0;
   I := 1;
@@ -849,7 +853,7 @@ begin
         lSize := lFieldDescIII.FieldSize;
         lPrec := lFieldDescIII.FieldPrecision;
         lNativeFieldType := lFieldDescIII.FieldType;
-        lCanHoldNull := (FDbfVersion = xFoxPro) and
+        lCanHoldNull := (FDbfVersion = xFoxPro) and 
           ((lFieldDescIII.FoxProFlags and $2) <> 0) and
           (lFieldName <> '_NULLFLAGS');
       end;
@@ -926,7 +930,7 @@ begin
 
     // dBase 7 -> read field properties, test if enough space, maybe no header
     if (FDbfVersion = xBaseVII) and (lPropHdrOffset + Sizeof(lFieldPropsHdr) <
-            PDbfHdr(Header).FullHdrSize) then
+            PDbfHdr(Header)^.FullHdrSize) then
     begin
       // read in field properties header
       ReadBlock(@lFieldPropsHdr, SizeOf(lFieldPropsHdr), lPropHdrOffset);
@@ -976,20 +980,20 @@ begin
     end;
 
   finally
-    HeaderSize := PDbfHdr(Header).FullHdrSize;
-    RecordSize := PDbfHdr(Header).RecordSize;
+    HeaderSize := PDbfHdr(Header)^.FullHdrSize;
+    RecordSize := PDbfHdr(Header)^.RecordSize;
   end;
 end;
 
 function TDbfFile.GetLanguageId: Integer;
 begin
-  Result := PDbfHdr(Header).Language;
+  Result := PDbfHdr(Header)^.Language;
 end;
 
 function TDbfFile.GetLanguageStr: String;
 begin
   if FDbfVersion >= xBaseVII then
-    Result := PAfterHdrVII(PChar(Header) + SizeOf(rDbfHdr)).LanguageDriverName;
+    Result := PAfterHdrVII(PChar(Header) + SizeOf(rDbfHdr))^.LanguageDriverName;
 end;
 
 {
@@ -1065,6 +1069,54 @@ begin
   end;
 end;
 
+procedure TDbfFile.Rename(DestFileName: string; NewIndexFileNames: TStrings; DeleteFiles: boolean);
+var
+  lIndexFileNames: TStrings;
+  lIndexFile: TIndexFile;
+  NewBaseName: string;
+  I: integer;
+begin
+  // get memory for index file list
+  lIndexFileNames := TStringList.Create;
+  try 
+    // save index filenames
+    for I := 0 to FIndexFiles.Count - 1 do
+    begin
+      lIndexFile := TIndexFile(IndexFiles[I]);
+      lIndexFileNames.Add(lIndexFile.FileName);
+      // prepare changing the dbf file name, needs changes in index files
+      lIndexFile.PrepareRename(NewIndexFileNames[I]);
+    end;
+
+    // close file
+    Close;
+
+    if DeleteFiles then
+    begin
+      SysUtils.DeleteFile(DestFileName);
+      SysUtils.DeleteFile(ChangeFileExt(DestFileName, GetMemoExt));
+    end else begin
+      I := 0;
+      FindNextName(DestFileName, NewBaseName, I);
+      SysUtils.RenameFile(DestFileName, NewBaseName);
+      SysUtils.RenameFile(ChangeFileExt(DestFileName, GetMemoExt), 
+        ChangeFileExt(NewBaseName, GetMemoExt));
+    end;
+    // delete old index files
+    for I := 0 to NewIndexFileNames.Count - 1 do
+      SysUtils.DeleteFile(NewIndexFileNames.Strings[I]);
+    // rename the new dbf files
+    SysUtils.RenameFile(FileName, DestFileName);
+    SysUtils.RenameFile(ChangeFileExt(FileName, GetMemoExt), 
+      ChangeFileExt(DestFileName, GetMemoExt));
+    // rename new index files
+    for I := 0 to NewIndexFileNames.Count - 1 do
+      SysUtils.RenameFile(lIndexFileNames.Strings[I], NewIndexFileNames.Strings[I]);
+  finally
+    lIndexFileNames.Free;
+  end;  
+end;
+
 type
   TRestructFieldInfo = record
     SourceOffset: Integer;
@@ -1072,6 +1124,10 @@ type
     Size: Integer;
   end;
 
+  { assume nobody has more than 8192 fields, otherwise possibly range check error }
+  PRestructFieldInfo = ^TRestructFieldInfoArray;
+  TRestructFieldInfoArray = array[0..8191] of TRestructFieldInfo;
+
 procedure TDbfFile.RestructureTable(DbfFieldDefs: TDbfFieldDefs; Pack: Boolean);
 var
   DestDbfFile: TDbfFile;
@@ -1079,12 +1135,12 @@ var
   TempIndexFile: TIndexFile;
   DestFieldDefs: TDbfFieldDefs;
   TempDstDef, TempSrcDef: TDbfFieldDef;
-  OldIndexFiles, NewIndexFiles: TStrings;
-  IndexName, NewBaseName, OldBaseName: string;
+  OldIndexFiles: TStrings;
+  IndexName, NewBaseName: string;
   I, lRecNo, lFieldNo, lFieldSize, lBlobRecNo, lWRecNo, srcOffset, dstOffset: Integer;
   pBuff, pDestBuff: PChar;
   pBlobRecNoBuff: array[1..11] of Char;
-  RestructFieldInfo: array of TRestructFieldInfo;
+  RestructFieldInfo: PRestructFieldInfo;
   BlobStream: TMemoryStream;
 begin
   // nothing to do?
@@ -1097,7 +1153,6 @@ begin
   // make up some temporary filenames
   lRecNo := 0;
   FindNextName(FileName, NewBaseName, lRecNo);
-  FindNextName(FileName, OldBaseName, lRecNo);
 
   // select final field definition list
   if DbfFieldDefs = nil then
@@ -1132,7 +1187,7 @@ begin
     DestDbfFile.FinishCreate(DestFieldDefs, 512);
 
   // adjust size and offsets of fields
-  SetLength(RestructFieldInfo, DestFieldDefs.Count);
+  GetMem(RestructFieldInfo, sizeof(TRestructFieldInfo)*DestFieldDefs.Count);
   for lFieldNo := 0 to DestFieldDefs.Count - 1 do
   begin
     TempDstDef := DestFieldDefs.Items[lFieldNo];
@@ -1143,16 +1198,16 @@ begin
       begin
         // get minimum field length
         lFieldSize := Min(TempSrcDef.Precision, TempDstDef.Precision) +
-          Min(TempSrcDef.Size - TempSrcDef.Precision,
+          Min(TempSrcDef.Size - TempSrcDef.Precision, 
             TempDstDef.Size - TempDstDef.Precision);
         // if one has dec separator, but other not, we lose one digit
-        if (TempDstDef.Precision > 0) xor
+        if (TempDstDef.Precision > 0) xor 
           ((TempSrcDef.NativeFieldType in ['F', 'N']) and (TempSrcDef.Precision > 0)) then
           Dec(lFieldSize);
         // should not happen, but check nevertheless (maybe corrupt data)
         if lFieldSize < 0 then
           lFieldSize := 0;
-        srcOffset := TempSrcDef.Size - TempSrcDef.Precision -
+        srcOffset := TempSrcDef.Size - TempSrcDef.Precision - 
           (TempDstDef.Size - TempDstDef.Precision);
         if srcOffset < 0 then
         begin
@@ -1194,12 +1249,10 @@ begin
   end;
   TempIndexDef.Free;
 
-  // get memory for index file list
-  OldIndexFiles := TStringList.Create;
-  NewIndexFiles := TStringList.Create;
   // get memory for record buffers
   GetMem(pBuff, RecordSize);
   BlobStream := TMemoryStream.Create;
+  OldIndexFiles := TStringList.Create;
   // if restructure, we need memory for dest buffer, otherwise use source
   if DbfFieldDefs = nil then
     pDestBuff := pBuff
@@ -1222,7 +1275,11 @@ begin
       begin
         // if restructure, initialize dest
         if DbfFieldDefs <> nil then
+        begin
           DestDbfFile.InitRecord(pDestBuff);
+          // copy deleted mark (the first byte)
+          pDestBuff^ := pBuff^;
+        end;
 
         if (DbfFieldDefs <> nil) or (FMemoFile <> nil) then
         begin
@@ -1277,52 +1334,31 @@ begin
 
     // save index filenames
     for I := 0 to FIndexFiles.Count - 1 do
-    begin
-      OldIndexFiles.Add(TIndexFile(FIndexFiles.Items[I]).FileName);
-      NewIndexFiles.Add(TIndexFile(DestDbfFile.IndexFiles[I]).FileName);
-    end;
+      OldIndexFiles.Add(TIndexFile(IndexFiles[I]).FileName);
 
-    // close temp file
-    DestDbfFile.Close;
     // close dbf
     Close;
 
     // if restructure -> rename the old dbf files
     // if pack only -> delete the old dbf files
-    if Pack and (DbfFieldDefs = nil) then
-    begin
-      SysUtils.DeleteFile(FileName);
-      SysUtils.DeleteFile(ChangeFileExt(FileName, GetMemoExt));
-    end else begin
-      SysUtils.RenameFile(FileName,                        OldBaseName);
-      SysUtils.RenameFile(ChangeFileExt(FileName, GetMemoExt), ChangeFileExt(OldBaseName, GetMemoExt));
-    end;
-    // delete old index files
-    for I := 0 to OldIndexFiles.Count - 1 do
-      SysUtils.DeleteFile(OldIndexFiles.Strings[I]);
-    // rename the new dbf files
-    SysUtils.RenameFile(NewBaseName,                        FileName);
-    SysUtils.RenameFile(ChangeFileExt(NewBaseName, GetMemoExt), ChangeFileExt(FileName, GetMemoExt));
-    // rename new index files
-    for I := 0 to OldIndexFiles.Count - 1 do
-      SysUtils.RenameFile(NewIndexFiles.Strings[I], OldIndexFiles.Strings[I]);
-
+    DestDbfFile.Rename(FileName, OldIndexFiles, DbfFieldDefs = nil);
+    
     // we have to reinit fielddefs if restructured
     Open;
 
     // crop deleted records
     RecordCount := lWRecNo - 1;
     // update date/time stamp, recordcount
-    PDbfHdr(Header).RecordCount := RecordCount;
+    PDbfHdr(Header)^.RecordCount := RecordCount;
     WriteHeader;
   finally
     // close temporary file
     FreeAndNil(DestDbfFile);
     // free mem
-    OldIndexFiles.Free;
-    NewIndexFiles.Free;
+    FreeAndNil(OldIndexFiles);
     FreeMem(pBuff);
     FreeAndNil(BlobStream);
+    FreeMem(RestructFieldInfo);
     if DbfFieldDefs <> nil then
       FreeMem(pDestBuff);
   end;
@@ -1446,7 +1482,7 @@ begin
     Result := (PByte(Src)^ and (1 shl (AFieldDef.NullPosition and $7))) <> 0;
     exit;
   end;
-
+  
   FieldOffset := AFieldDef.Offset;
   FieldSize := AFieldDef.Size;
   Src := PChar(Src) + FieldOffset;
@@ -1612,7 +1648,7 @@ begin
   end;
 end;
 
-procedure TDbfFile.UpdateNullField(Buffer: Pointer; AFieldDef: TDbfFieldDef;
+procedure TDbfFile.UpdateNullField(Buffer: Pointer; AFieldDef: TDbfFieldDef; 
   Action: TUpdateNullField);
 var
   NullDst: pbyte;
@@ -1819,11 +1855,11 @@ var
 begin
   // clear buffer (assume all string, fix specific fields later)
   FillChar(DestBuf^, RecordSize,' ');
-
+  
   // set nullflags field so that all fields are null
   if FNullField <> nil then
     FillChar(PChar(DestBuf+FNullField.Offset)^, FNullField.Size, $FF);
-
+    
   // check binary and default fields
   for I := 0 to FFieldDefs.Count-1 do
   begin
@@ -1863,7 +1899,7 @@ begin
       if (TempFieldDef.NativeFieldType = '+') then
       begin
         // read current auto inc, from header or field, depending on sharing
-        lAutoIncOffset := sizeof(rDbfHdr) + sizeof(rAfterHdrVII) +
+        lAutoIncOffset := sizeof(rDbfHdr) + sizeof(rAfterHdrVII) + 
           FieldDescVII_AutoIncOffset + I * sizeof(rFieldDescVII);
         // TODO: big-endianness
         if NeedLocks then
@@ -1882,7 +1918,7 @@ begin
 
     // write modified header (new autoinc values) to file
     WriteHeader;
-
+    
     // release lock if locked
     if NeedLocks then
       UnlockPage(0);
@@ -1927,9 +1963,11 @@ procedure TDbfFile.OpenIndex(IndexName, IndexField: string; CreateIndex: Boolean
   //
 const
   // memcr, memop, excr, exopen, rwcr, rwopen, rdonly
-  IndexOpenMode: array[pfMemoryCreate..pfReadOnly] of TPagedFileMode =
-    (pfMemoryCreate, pfMemoryCreate, pfExclusiveOpen, pfExclusiveOpen, pfReadWriteOpen, pfReadWriteOpen,
-     pfReadOnly);
+  IndexOpenMode: array[boolean, pfMemoryCreate..pfReadOnly] of TPagedFileMode =
+   ((pfMemoryCreate, pfMemoryCreate, pfExclusiveOpen, pfExclusiveOpen, pfReadWriteOpen, pfReadWriteOpen,
+     pfReadOnly),
+    (pfMemoryCreate, pfMemoryCreate, pfExclusiveCreate, pfExclusiveCreate, pfReadWriteCreate, pfReadWriteCreate,
+     pfReadOnly));
 var
   lIndexFile: TIndexFile;
   lIndexFileName: string;
@@ -1974,7 +2012,7 @@ begin
       // try to open / create the file
       lIndexFile := TIndexFile.Create(Self);
       lIndexFile.FileName := lIndexFileName;
-      lIndexFile.Mode := IndexOpenMode[Mode];
+      lIndexFile.Mode := IndexOpenMode[CreateIndex, Mode];
       lIndexFile.AutoCreate := CreateIndex or (Length(IndexField) > 0);
       lIndexFile.CodePage := UseCodePage;
       lIndexFile.OnLocaleError := FOnLocaleError;
@@ -2036,7 +2074,7 @@ begin
         end;
         // if mdx file just created, write changes to dbf header
         // set MDX flag to true
-        PDbfHdr(Header).MDXFlag := 1;
+        PDbfHdr(Header)^.MDXFlag := 1;
         WriteHeader;
       except
         // :-( need to undo 'damage'....
@@ -2220,7 +2258,7 @@ begin
         // erase file
         Sysutils.DeleteFile(lFileName);
         // clear mdx flag
-        PDbfHdr(Header).MDXFlag := 0;
+        PDbfHdr(Header)^.MDXFlag := 0;
         WriteHeader;
       end;
     end else begin
@@ -2315,7 +2353,7 @@ begin
   // read current header
   ReadHeader;
   // increase current record count
-  Inc(PDbfHdr(Header).RecordCount);
+  Inc(PDbfHdr(Header)^.RecordCount);
   // write header to disk
   WriteHeader;
   // done with header
@@ -2349,7 +2387,7 @@ begin
     // rolled back
     LockPage(0, true);
     ReadHeader;
-    Dec(PDbfHdr(Header).RecordCount);
+    Dec(PDbfHdr(Header)^.RecordCount);
     WriteHeader;
     UnlockPage(0);
     // roll back indexes too
@@ -2587,12 +2625,12 @@ begin
 //  Windows.GetUserName(@FUserName[0], FUserNameLen);
   Windows.GetComputerName(PChar(FUserName), FUserNameLen);
   SetLength(FUserName, FUserNameLen);
-{$else}
+{$else}  
 {$ifdef FPC}
   FpUname(TempName);
   FUserName := TempName.machine;
   FUserNameLen := Length(FUserName);
-{$endif}
+{$endif}  
 {$endif}
 end;
 
@@ -2670,3 +2708,4 @@ finalization
 *)
 
 end.
+

fcl/db/dbase/dbf_fields.pas

@@ -2,14 +2,14 @@ unit dbf_fields;
 
 interface
 
-{$I Dbf_Common.inc}
+{$I dbf_common.inc}
 
 uses
   Classes,
   SysUtils,
-  Db,
-  Dbf_Common,
-  Dbf_Str;
+  db,
+  dbf_common,
+  dbf_str;
 
 type
   PDbfFieldDef = ^TDbfFieldDef;
@@ -49,7 +49,7 @@ type
 
     property DbfVersion: TXBaseVersion read GetDbfVersion;
   public
-    constructor Create(Collection: TCollection); override;
+    constructor Create(ACollection: TCollection); override;
     destructor Destroy; override;
 
     procedure Assign(Source: TPersistent); override;
@@ -107,9 +107,9 @@ type
 implementation
 
 uses
-  Dbf_DbfFile;      // for dbf header structures
+  dbf_dbffile;      // for dbf header structures
 
-{$I Dbf_Struct.inc}
+{$I dbf_struct.inc}
 
 // I keep changing that fields...
 // Last time has been asked by Venelin Georgiev
@@ -185,7 +185,7 @@ end;
 //====================================================================
 // DbfFieldDef
 //====================================================================
-constructor TDbfFieldDef.Create(Collection: TCollection); {virtual}
+constructor TDbfFieldDef.Create(ACollection: TCollection); {virtual}
 begin
   inherited;
 
@@ -370,7 +370,7 @@ begin
         FFieldType := ftBCD
       else
         FFieldType := ftCurrency;
-    '0' : FFieldType := ftBytes;        { Visual FoxPro ``_NullFlags'' }
+    '0' : FFieldType := ftBytes;	{ Visual FoxPro ``_NullFlags'' }
   else
     FNativeFieldType := #0;
     FFieldType := ftUnknown;
@@ -408,7 +408,7 @@ begin
         FNativeFieldType := 'I'
       else
         FNativeFieldType := 'N';
-    ftBCD, ftCurrency:
+    ftBCD, ftCurrency: 
       if DbfVersion = xFoxPro then
         FNativeFieldType := 'Y';
   end;
@@ -560,3 +560,4 @@ begin
 end;
 
 end.
+

fcl/db/dbase/dbf_idxcur.pas

@@ -2,15 +2,15 @@ unit dbf_idxcur;
 
 interface
 
-{$I Dbf_Common.inc}
+{$I dbf_common.inc}
 
 uses
   SysUtils,
   Classes,
-  Dbf_Cursor,
-  Dbf_IdxFile,
-  Dbf_PrsDef,
-  Dbf_Common;
+  dbf_cursor,
+  dbf_idxfile,
+  dbf_prsdef,
+  dbf_common;
 
 type
 
@@ -178,3 +178,4 @@ begin
 end;
 
 end.
+

fcl/db/dbase/dbf_lang.pas

@@ -1,6 +1,6 @@
 unit dbf_lang;
 
-{$i Dbf_Common.inc}
+{$I dbf_common.inc}
 
 interface
 
@@ -9,9 +9,9 @@ uses
   Windows;
 {$else}
 {$ifdef KYLIX}
-  Libc,
-{$endif}
-  Types, Dbf_Wtil;
+  Libc, 
+{$endif}  
+  Types, dbf_wtil;
 {$endif}
 
 const
@@ -636,3 +636,4 @@ begin
 end;
 
 end.
+

fcl/db/dbase/dbf_memo.pas

@@ -2,12 +2,12 @@ unit dbf_memo;
 
 interface
 
-{$I Dbf_Common.inc}
+{$I dbf_common.inc}
 
 uses
   Classes,
-  Dbf_PgFile,
-  Dbf_Common;
+  dbf_pgfile,
+  dbf_common;
 
 type
 
@@ -95,7 +95,7 @@ type
 implementation
 
 uses
-  SysUtils, Dbf_DbfFile;
+  SysUtils, dbf_dbffile;
 
 //====================================================================
 //=== Memo and binary fields support
@@ -168,7 +168,7 @@ begin
 
     // determine version
     if FDbfVersion = xBaseIII then
-      PDbtHdr(Header).bVer := 3;
+      PDbtHdr(Header)^.bVer := 3;
     VirtualLocks := false;
 
     if FileCreated or (HeaderSize = 0) then
@@ -330,7 +330,7 @@ var
   bytesBefore: Integer;
   bytesAfter: Integer;
   totsize: Integer;
-  read: Integer;
+  readBytes: Integer;
   append: Boolean;
   tmpRecNo: Integer;
 begin
@@ -372,28 +372,28 @@ begin
       totsize := Src.Size + bytesBefore + bytesAfter;
       if FDbfVersion <> xFoxPro then
       begin
-        PBlockHdr(FBuffer).MemoType := $0008FFFF;
-        PBlockHdr(FBuffer).MemoSize := totsize;
+        PBlockHdr(FBuffer)^.MemoType := $0008FFFF;
+        PBlockHdr(FBuffer)^.MemoSize := totsize;
       end else begin
-        PBlockHdr(FBuffer).MemoType := $01000000;
-        PBlockHdr(FBuffer).MemoSize := SwapInt(Src.Size);
+        PBlockHdr(FBuffer)^.MemoType := $01000000;
+        PBlockHdr(FBuffer)^.MemoSize := SwapInt(Src.Size);
       end;
     end;
     repeat
       // read bytes, don't overwrite header
-      read := Src.Read(FBuffer[bytesBefore], RecordSize{PDbtHdr(Header).BlockLen}-bytesBefore);
+      readBytes := Src.Read(FBuffer[bytesBefore], RecordSize{PDbtHdr(Header).BlockLen}-bytesBefore);
       // end of input data reached ? check if need to write block terminators
-      while (read < RecordSize - bytesBefore) and (bytesAfter > 0) do
+      while (readBytes < RecordSize - bytesBefore) and (bytesAfter > 0) do
       begin
-        FBuffer[read] := #$1A;
-        Inc(read);
+        FBuffer[readBytes] := #$1A;
+        Inc(readBytes);
         Dec(bytesAfter);
       end;
       // have we read anything that is to be written?
-      if read > 0 then
+      if readBytes > 0 then
       begin
         // clear any unused space
-        FillChar(FBuffer[bytesBefore+read], RecordSize-read-bytesBefore, ' ');
+        FillChar(FBuffer[bytesBefore+readBytes], RecordSize-readBytes-bytesBefore, ' ');
         // write to disk
         WriteRecord(tmpRecNo, @FBuffer[0]);
         Inc(tmpRecNo);
@@ -422,31 +422,31 @@ begin
   if FDbfVersion = xBaseIII then
     Result := 512
   else
-    Result := PDbtHdr(Header).BlockLen;
+    Result := PDbtHdr(Header)^.BlockLen;
 end;
 
 function  TDbaseMemoFile.GetMemoSize: Integer;
 begin
   // dBase4 memofiles contain small 'header'
   if PInteger(@FBuffer[0])^ = $0008FFFF then
-    Result := PBlockHdr(FBuffer).MemoSize-8
+    Result := PBlockHdr(FBuffer)^.MemoSize-8
   else
     Result := -1;
 end;
 
 function  TDbaseMemoFile.GetNextFreeBlock: Integer;
 begin
-  Result := PDbtHdr(Header).NextBlock;
+  Result := PDbtHdr(Header)^.NextBlock;
 end;
 
 procedure TDbaseMemoFile.SetNextFreeBlock(BlockNo: Integer);
 begin
-  PDbtHdr(Header).NextBlock := BlockNo;
+  PDbtHdr(Header)^.NextBlock := BlockNo;
 end;
 
 procedure TDbaseMemoFile.SetBlockLen(BlockLen: Integer);
 begin
-  PDbtHdr(Header).BlockLen := BlockLen;
+  PDbtHdr(Header)^.BlockLen := BlockLen;
 end;
 
 // ------------------------------------------------------------------
@@ -455,27 +455,27 @@ end;
 
 function  TFoxProMemoFile.GetBlockLen: Integer;
 begin
-  Result := Swap(PFptHdr(Header).BlockLen);
+  Result := Swap(PFptHdr(Header)^.BlockLen);
 end;
 
 function  TFoxProMemoFile.GetMemoSize: Integer;
 begin
-  Result := SwapInt(PBlockHdr(FBuffer).MemoSize);
+  Result := SwapInt(PBlockHdr(FBuffer)^.MemoSize);
 end;
 
 function  TFoxProMemoFile.GetNextFreeBlock: Integer;
 begin
-  Result := SwapInt(PFptHdr(Header).NextBlock);
+  Result := SwapInt(PFptHdr(Header)^.NextBlock);
 end;
 
 procedure TFoxProMemoFile.SetNextFreeBlock(BlockNo: Integer);
 begin
-  PFptHdr(Header).NextBlock := SwapInt(BlockNo);
+  PFptHdr(Header)^.NextBlock := SwapInt(BlockNo);
 end;
 
 procedure TFoxProMemoFile.SetBlockLen(BlockLen: Integer);
 begin
-  PFptHdr(Header).BlockLen := Swap(BlockLen);
+  PFptHdr(Header)^.BlockLen := Swap(BlockLen);
 end;
 
 // ------------------------------------------------------------------

fcl/db/dbase/dbf_parser.pas

@@ -2,7 +2,7 @@ unit dbf_parser;
 
 interface
 
-{$I Dbf_Common.inc}
+{$I dbf_common.inc}
 
 uses
   SysUtils,
@@ -11,14 +11,14 @@ uses
   Libc,
 {$endif}
 {$ifndef WIN32}
-  Dbf_Wtil,
+  dbf_wtil,
 {$endif}
-  Db,
-  Dbf_PrsCore,
-  Dbf_Common,
-  Dbf_Fields,
-  Dbf_PrsDef,
-  Dbf_PrsSupp;
+  db,
+  dbf_prscore,
+  dbf_common,
+  dbf_fields,
+  dbf_prsdef,
+  dbf_prssupp;
 
 type
 
@@ -191,9 +191,9 @@ procedure Func_NOT(Param: PExpressionRec);
 implementation
 
 uses
-  Dbf,
-  Dbf_DbfFile,
-  Dbf_Str
+  dbf,
+  dbf_dbffile,
+  dbf_str
 {$ifdef WIN32}
   ,Windows
 {$endif}
@@ -447,15 +447,8 @@ end;
 
 procedure TDateTimeFieldVar.Refresh(Buffer: PChar);
 begin
-  if FDbfFile.GetFieldDataFromDef(FieldDef, ftDateTime, Buffer, @FFieldVal) then
-  begin
-{$ifndef SUPPORT_NEW_FIELDDATA}
-    // convert BDE timestamp to normal datetime
-    FFieldVal.DateTime := BDETimeStampToDateTime(FFieldVal.DateTime);
-{$endif}
-  end else begin
+  if not FDbfFile.GetFieldDataFromDef(FieldDef, ftDateTime, Buffer, @FFieldVal) then
     FFieldVal.DateTime := 0.0;
-  end;
 end;
 
 //--Expression functions-----------------------------------------------------
@@ -533,7 +526,7 @@ begin
       // convert to string
       width := GetStrFromInt(Val, Res.MemoryPos^);
       // advance pointer
-      Inc(Param.Res.MemoryPos^, width);
+      Inc(Param^.Res.MemoryPos^, width);
     end;
     // null-terminate
     Res.MemoryPos^^ := #0;
@@ -542,7 +535,7 @@ end;
 
 procedure FuncIntToStr(Param: PExpressionRec);
 begin
-  FuncIntToStr_Gen(Param, PInteger(Param.Args[0])^);
+  FuncIntToStr_Gen(Param, PInteger(Param^.Args[0])^);
 end;
 
 procedure FuncDateToStr(Param: PExpressionRec);
@@ -552,7 +545,7 @@ begin
   with Param^ do
   begin
     // create in temporary string
-    DateTimeToString(TempStr, 'yyyymmdd', PDateTimeRec(Args[0]).DateTime);
+    DateTimeToString(TempStr, 'yyyymmdd', PDateTimeRec(Args[0])^.DateTime);
     // copy to buffer
     Res.Append(PChar(TempStr), Length(TempStr));
   end;
@@ -1707,7 +1700,7 @@ initialization
     Add(TFunction.CreateOper('AND', 'BB', etBoolean, Func_AND, 90));
     Add(TFunction.CreateOper('OR',  'BB', etBoolean, Func_OR, 100));
 
-    // functions - name, description, param types, min params, result type, func addr
+    // Functions - name, description, param types, min params, result type, Func addr
     Add(TFunction.Create('STR',       '',      'FII', 1, etString, FuncFloatToStr, ''));
     Add(TFunction.Create('STR',       '',      'III', 1, etString, FuncIntToStr, ''));
     Add(TFunction.Create('DTOS',      '',      'D',   1, etString, FuncDateToStr, ''));
@@ -1739,7 +1732,7 @@ initialization
     Add(TFunction.CreateOper('>=','SS', etBoolean, FuncStr_GTE, 80));
     Add(TFunction.CreateOper('<>','SS', etBoolean, FuncStr_NEQ, 80));
   end;
-
+    
   with DbfWordsSensNoPartialList do
     Add(TFunction.CreateOper('=', 'SS', etBoolean, FuncStr_EQ , 80));
 
@@ -1757,3 +1750,4 @@ finalization
   DbfWordsSensPartialList.Free;
 
 end.
+

fcl/db/dbase/dbf_pgcfile.pas

@@ -4,16 +4,16 @@ unit dbf_pgcfile;
 
 interface
 
-{$I Dbf_Common.inc}
+{$I dbf_common.inc}
 
 {$ifdef USE_CACHE}
 
 uses
   Classes,
   SysUtils,
-  Dbf_Common,
-  Dbf_Avl,
-  Dbf_PgFile;
+  dbf_common,
+  dbf_avl,
+  dbf_pgfile;
 
 type
 

fcl/db/dbase/dbf_pgfile.pas

@@ -2,12 +2,12 @@ unit dbf_pgfile;
 
 interface
 
-{$I Dbf_Common.inc}
+{$I dbf_common.inc}
 
 uses
   Classes,
   SysUtils,
-  Dbf_Common;
+  dbf_common;
 
 //const
 //  MaxHeaders = 256;
@@ -15,7 +15,7 @@ uses
 type
   EPagedFile = Exception;
 
-  TPagedFileMode = (pfNone, pfMemoryCreate, pfMemoryOpen, pfExclusiveCreate,
+  TPagedFileMode = (pfNone, pfMemoryCreate, pfMemoryOpen, pfExclusiveCreate, 
     pfExclusiveOpen, pfReadWriteCreate, pfReadWriteOpen, pfReadOnly);
 
   // access levels:
@@ -150,11 +150,11 @@ uses
   Windows,
 {$else}
 {$ifdef KYLIX}
-  Libc,
+  Libc, 
+{$endif}  
+  Types, dbf_wtil,
 {$endif}
-  Types, Dbf_Wtil,
-{$endif}
-  Dbf_Str;
+  dbf_str;
 
 //====================================================================
 // TPagedFile
@@ -207,7 +207,7 @@ procedure TPagedFile.OpenFile;
 var
   fileOpenMode: Word;
 begin
-  if FActive then exit;
+  if FActive then exit;  
 
   // store user specified mode
   FUserMode := FMode;
@@ -259,6 +259,8 @@ begin
   FNeedLocks := IsSharedAccess;
 {$endif}
   FActive := true;
+  // allocate memory for bufferahead
+  UpdateBufferSize;
 end;
 
 procedure TPagedFile.CloseFile;
@@ -266,9 +268,12 @@ begin
   if FActive then
   begin
     FlushHeader;
+    FlushBuffer;
     // don't free the user's stream
     if not (FMode in [pfMemoryOpen, pfMemoryCreate]) then
       FreeAndNil(FStream);
+    // free bufferahead buffer
+    FreeMemAndNil(FBufferPtr);
 
     // mode possibly overridden in case of auto-created file
     FMode := FUserMode;
@@ -909,3 +914,4 @@ begin
 end;
 
 end.
+

fcl/db/dbase/dbf_prscore.pas

@@ -8,14 +8,14 @@ unit dbf_prscore;
 
 interface
 
-{$I Dbf_Common.inc}
+{$I dbf_common.inc}
 
 uses
   SysUtils,
   Classes,
-  Dbf_Common,
-  Dbf_PrsSupp,
-  Dbf_PrsDef;
+  dbf_common,
+  dbf_prssupp,
+  dbf_prsdef;
 
 {$define ENG_NUMBERS}
 
@@ -194,7 +194,7 @@ begin
         CheckArguments(ArgList[I]);
 
         // test if correct type
-        if (ArgList[I].ExprWord.ResultType <> ExprCharToExprType(ExprWord.TypeSpec[I+1])) then
+        if (ArgList[I]^.ExprWord.ResultType <> ExprCharToExprType(ExprWord.TypeSpec[I+1])) then
           error := 2;
 
         // goto next argument
@@ -217,7 +217,7 @@ begin
         // check if not last function
         if I < FWordsList.Count - 1 then
         begin
-          TempExprWord := FWordsList.Items[I+1];
+          TempExprWord := TExprWord(FWordsList.Items[I+1]);
           if FWordsList.Compare(FWordsList.KeyOf(ExprWord), FWordsList.KeyOf(TempExprWord)) = 0 then
           begin
             ExprWord := TempExprWord;
@@ -328,13 +328,13 @@ var
 begin
   if ARec <> nil then
     repeat
-      TheNext := ARec.Next;
-      if ARec.Res <> nil then
-        ARec.Res.Free;
+      TheNext := ARec^.Next;
+      if ARec^.Res <> nil then
+        ARec^.Res.Free;
       I := 0;
-      while ARec.ArgList[I] <> nil do
+      while ARec^.ArgList[I] <> nil do
       begin
-        FreeMem(ARec.Args[I]);
+        FreeMem(ARec^.Args[I]);
         Inc(I);
       end;
       Dispose(ARec);
@@ -374,7 +374,7 @@ begin
     while ExprRec^.ArgList[I] <> nil do
     begin
       // save variable type for easy access
-      ExprRec^.ArgsType[I] := ExprRec^.ArgList[I].ExprWord.ResultType;
+      ExprRec^.ArgsType[I] := ExprRec^.ArgList[I]^.ExprWord.ResultType;
       // check if we need to copy argument, variables in general do not
       // need copying, except for fixed len strings which are not
       // null-terminated
@@ -408,13 +408,13 @@ begin
       FCurrentRec := ExprRec;
       FLastRec := ExprRec;
     end else begin
-      FLastRec.Next := ExprRec;
+      FLastRec^.Next := ExprRec;
       FLastRec := ExprRec;
     end;
   end;
 end;
 
-function TCustomExpressionParser.MakeTree(Expr: TExprCollection;
+function TCustomExpressionParser.MakeTree(Expr: TExprCollection; 
   FirstItem, LastItem: Integer): PExpressionRec;
 
 {
@@ -447,7 +447,7 @@ begin
   begin
     case TExprWord(Expr.Items[I]).ResultType of
       etLeftBracket: Inc(brCount);
-      etRightBracket:
+      etRightBracket: 
         begin
           Dec(brCount);
           if brCount < IArg then
@@ -478,17 +478,17 @@ begin
   // simple constant, variable or function?
   if LastItem = FirstItem then
   begin
-    Result.ExprWord := TExprWord(Expr.Items[FirstItem]);
-    Result.Oper := @Result.ExprWord.ExprFunc;
-    if Result.ExprWord.IsVariable then
+    Result^.ExprWord := TExprWord(Expr.Items[FirstItem]);
+    Result^.Oper := Result^.ExprWord.ExprFunc;
+    if Result^.ExprWord.IsVariable then
     begin
       // copy pointer to variable
-      Result.Args[0] := Result.ExprWord.AsPointer;
+      Result^.Args[0] := Result^.ExprWord.AsPointer;
       // is this a fixed length string variable?
-      if Result.ExprWord.FixedLen >= 0 then
+      if Result^.ExprWord.FixedLen >= 0 then
       begin
         // store length as second parameter
-        Result.Args[1] := PChar(Result.ExprWord.LenAsPointer);
+        Result^.Args[1] := PChar(Result^.ExprWord.LenAsPointer);
       end;
     end;
     exit;
@@ -517,23 +517,23 @@ begin
   if IEnd >= FirstItem then
   begin
     // save operator
-    Result.ExprWord := TExprWord(Expr.Items[IEnd]);
-    Result.Oper := Result.ExprWord.ExprFunc;
+    Result^.ExprWord := TExprWord(Expr.Items[IEnd]);
+    Result^.Oper := Result^.ExprWord.ExprFunc;
     // recurse into left part if present
     if IEnd > FirstItem then
     begin
-      Result.ArgList[IArg] := MakeTree(Expr, FirstItem, IEnd-1);
+      Result^.ArgList[IArg] := MakeTree(Expr, FirstItem, IEnd-1);
       Inc(IArg);
     end;
     // recurse into right part if present
     if IEnd < LastItem then
-      Result.ArgList[IArg] := MakeTree(Expr, IEnd+1, LastItem);
-  end else
-  if TExprWord(Expr.Items[FirstItem]).IsFunction then
+      Result^.ArgList[IArg] := MakeTree(Expr, IEnd+1, LastItem);
+  end else 
+  if TExprWord(Expr.Items[FirstItem]).IsFunction then 
   begin
     // save function
-    Result.ExprWord := TExprWord(Expr.Items[FirstItem]);
-    Result.Oper := Result.ExprWord.ExprFunc;
+    Result^.ExprWord := TExprWord(Expr.Items[FirstItem]);
+    Result^.Oper := Result^.ExprWord.ExprFunc;
     // parse function arguments
     IEnd := FirstItem + 1;
     IStart := IEnd;
@@ -552,7 +552,7 @@ begin
             if brCount = 1 then
             begin
               // argument separation found, build tree of argument expression
-              Result.ArgList[IArg] := MakeTree(Expr, IStart, IEnd-1);
+              Result^.ArgList[IArg] := MakeTree(Expr, IStart, IEnd-1);
               Inc(IArg);
               IStart := IEnd + 1;
             end;
@@ -561,7 +561,7 @@ begin
       end;
 
       // parse last argument
-      Result.ArgList[IArg] := MakeTree(Expr, IStart, IEnd-1);
+      Result^.ArgList[IArg] := MakeTree(Expr, IStart, IEnd-1);
     end;
   end else
     raise EParserException.Create('Operator/function missing');
@@ -972,8 +972,8 @@ begin
     //LAST operand should be boolean -otherwise If(,,) doesn't work
     while (FLastRec^.Next <> nil) do
       FLastRec := FLastRec^.Next;
-    if FLastRec.ExprWord <> nil then
-      Result := FLastRec.ExprWord.ResultType;
+    if FLastRec^.ExprWord <> nil then
+      Result := FLastRec^.ExprWord.ResultType;
   end;
 end;
 
@@ -990,16 +990,16 @@ begin
   pnew := NewExprWord.AsPointer;
   Rec := FCurrentRec;
   repeat
-    if (Rec.ExprWord = OldExprWord) then
+    if (Rec^.ExprWord = OldExprWord) then
     begin
-      Rec.ExprWord := NewExprWord;
-      Rec.Oper := NewExprWord.ExprFunc;
+      Rec^.ExprWord := NewExprWord;
+      Rec^.Oper := NewExprWord.ExprFunc;
     end;
     if p <> nil then
-      for J := 0 to Rec.ExprWord.MaxFunctionArg - 1 do
-        if Rec.Args[J] = p then
-          Rec.Args[J] := pnew;
-    Rec := Rec.Next;
+      for J := 0 to Rec^.ExprWord.MaxFunctionArg - 1 do
+        if Rec^.Args[J] = p then
+          Rec^.Args[J] := pnew;
+    Rec := Rec^.Next;
   until Rec = nil;
 end;
 
@@ -1008,20 +1008,20 @@ var
   I: Integer;
 begin
   New(Result);
-  Result.Oper := nil;
-  Result.AuxData := nil;
+  Result^.Oper := nil;
+  Result^.AuxData := nil;
   for I := 0 to MaxArg - 1 do
   begin
-    Result.Args[I] := nil;
-    Result.ArgsPos[I] := nil;
-    Result.ArgsSize[I] := 0;
-    Result.ArgsType[I] := etUnknown;
-    Result.ArgList[I] := nil;
+    Result^.Args[I] := nil;
+    Result^.ArgsPos[I] := nil;
+    Result^.ArgsSize[I] := 0;
+    Result^.ArgsType[I] := etUnknown;
+    Result^.ArgList[I] := nil;
   end;
-  Result.Res := nil;
-  Result.Next := nil;
-  Result.ExprWord := nil;
-  Result.ResetDest := false;
+  Result^.Res := nil;
+  Result^.Next := nil;
+  Result^.ExprWord := nil;
+  Result^.ResetDest := false;
 end;
 
 procedure TCustomExpressionParser.Evaluate(AnExpression: string);
@@ -1057,7 +1057,7 @@ begin
   begin
     // if no function specified, then no need to replace!
     if AFunction <> nil then
-      ReplaceExprWord(FWordsList.Items[I], TExprWord(AFunction));
+      ReplaceExprWord(TExprWord(FWordsList.Items[I]), TExprWord(AFunction));
     FWordsList.AtFree(I);
   end;
   if AFunction <> nil then
@@ -1077,7 +1077,7 @@ var
 begin
   if FWordsList.Search(PChar(AExprWord.Name), IOldVar) then
   begin
-    ReplaceExprWord(FWordsList.Items[IOldVar], AExprWord);
+    ReplaceExprWord(TExprWord(FWordsList.Items[IOldVar]), AExprWord);
     FWordsList.AtFree(IOldVar);
     FWordsList.Add(AExprWord);
   end
@@ -1124,3 +1124,4 @@ begin
 end;
 
 end.
+

fcl/db/dbase/dbf_prsdef.pas

@@ -2,13 +2,13 @@ unit dbf_prsdef;
 
 interface
 
-{$I Dbf_Common.inc}
+{$I dbf_common.inc}
 
 uses
   SysUtils,
   Classes,
-  Dbf_Common,
-  Dbf_PrsSupp;
+  dbf_common,
+  dbf_prssupp;
 
 const
   MaxArg = 6;
@@ -452,12 +452,14 @@ end;
 
 function TExprWord.GetIsVariable: Boolean;
 begin
+  // delphi wants to call the function pointed to by the variable, use '@'
+  // fpc simply returns pointer to function, no '@' needed
   Result := (@FExprFunc = @_StringVariable)         or
             (@FExprFunc = @_StringConstant)         or
             (@FExprFunc = @_StringVariableFixedLen) or
             (@FExprFunc = @_FloatVariable)          or
             (@FExprFunc = @_IntegerVariable)        or
-//            (@FExprFunc = @_SmallIntVariable)       or
+//            (FExprFunc = @_SmallIntVariable)       or
 {$ifdef SUPPORT_INT64}
             (@FExprFunc = @_LargeIntVariable)       or
 {$endif}
@@ -475,7 +477,7 @@ begin
 // not null-terminated (fixed len)
             (@FExprFunc <> @_FloatVariable)          and
             (@FExprFunc <> @_IntegerVariable)        and
-//            (@FExprFunc <> @_SmallIntVariable)       and
+//            (FExprFunc <> @_SmallIntVariable)       and
 {$ifdef SUPPORT_INT64}
             (@FExprFunc <> @_LargeIntVariable)       and
 {$endif}
@@ -1039,3 +1041,4 @@ begin
 end;
 
 end.
+

fcl/db/dbase/dbf_prssupp.pas

@@ -2,7 +2,7 @@ unit dbf_prssupp;
 
 // parse support
 
-{$i Dbf_Common.inc}
+{$I dbf_common.inc}
 
 interface
 
@@ -182,3 +182,4 @@ begin
 end;
 
 end.
+

fcl/db/dbase/dbf_reg.pas

@@ -22,14 +22,14 @@ unit dbf_reg;
 
 interface
 
-{$I Dbf_Common.inc}
+{$I dbf_common.inc}
 
 procedure Register;
 
 implementation
 
 {$ifndef FPC}
-{$R Dbf.dcr}
+{$R dbf.dcr}
 {$endif}
 
 uses
@@ -45,12 +45,12 @@ uses
   Forms,
   Dialogs,
 {$endif}
-  Dbf,
-  Dbf_DbfFile,
-  Dbf_IdxFile,
-  Dbf_Fields,
-  Dbf_Common,
-  Dbf_Str
+  dbf,
+  dbf_dbffile,
+  dbf_idxfile,
+  dbf_fields,
+  dbf_common,
+  dbf_str
 {$ifndef FPC}
   ,ExptIntf
 {$endif}

fcl/db/dbase/dbf_str.pas

@@ -2,8 +2,8 @@ unit dbf_str;
 
 interface
 
-{$I Dbf_Common.inc}
-{$I Dbf_Str.inc}
+{$I dbf_common.inc}
+{$I dbf_str.inc}
 
 implementation
 
@@ -33,3 +33,4 @@ initialization
   STRING_INDEX_NOT_EXIST              := 'Index "%s" does not exist.';
   STRING_NEED_EXCLUSIVE_ACCESS        := 'Exclusive access is required for this operation.';
 end.
+

fcl/db/dbase/dbf_str_es.pas

@@ -2,8 +2,8 @@ unit dbf_str;
 
 interface
 
-{$I Dbf_Common.inc}
-{$I Dbf_Str.inc}
+{$I dbf_common.inc}
+{$I dbf_str.inc}
 
 implementation
 
@@ -33,3 +33,4 @@ initialization
   STRING_INDEX_NOT_EXIST              := 'Indice "%s" no existe.';
   STRING_NEED_EXCLUSIVE_ACCESS        := 'Acceso Exclusivo requirido para esta operación.';
 end.
+

fcl/db/dbase/dbf_str_fr.pas

@@ -2,7 +2,7 @@ unit dbf_str;
 
 interface
 
-{$I Dbf_Common.inc}
+{$I dbf_common.inc}
 
 var
   STRING_FILE_NOT_FOUND: string;
@@ -51,3 +51,4 @@ initialization
   STRING_INDEX_NOT_EXIST              := 'L''index "%s" n''existe pas.';
   STRING_NEED_EXCLUSIVE_ACCESS        := 'Access exclusif requis pour cette opération.';
 end.
+

fcl/db/dbase/dbf_str_ita.pas

@@ -2,25 +2,9 @@ unit dbf_str;
 
 interface
 
-{$I Dbf_Common.inc}
+{$I dbf_common.inc}
+{$I dbf_str.inc}
 
-var
-  STRING_FILE_NOT_FOUND: string;
-  STRING_VERSION: string;
-
-  STRING_RECORD_LOCKED: string;
-
-  STRING_INVALID_DBF_FILE: string;
-  STRING_FIELD_TOO_LONG: string;
-  STRING_INVALID_FIELD_COUNT: string;
-
-  STRING_INDEX_BASED_ON_UNKNOWN_FIELD: string;
-  STRING_INDEX_BASED_ON_INVALID_FIELD: string;
-  STRING_INVALID_INDEX_TYPE: string;
-  STRING_CANNOT_OPEN_INDEX: string;
-  STRING_TOO_MANY_INDEXES: string;
-  STRING_INDEX_NOT_EXIST: string;
-  STRING_NEED_EXCLUSIVE_ACCESS: string;
 
 implementation
 

fcl/db/dbase/dbf_str_nl.pas

@@ -2,28 +2,8 @@ unit dbf_str;
 
 interface
 
-{$I Dbf_Common.inc}
-
-var
-  STRING_FILE_NOT_FOUND: string;
-  STRING_VERSION: string;
-
-  STRING_RECORD_LOCKED: string;
-  STRING_KEY_VIOLATION: string;
-
-  STRING_INVALID_DBF_FILE: string;
-  STRING_FIELD_TOO_LONG: string;
-  STRING_INVALID_FIELD_COUNT: string;
-  STRING_INVALID_FIELD_TYPE: string;
-
-  STRING_INDEX_BASED_ON_UNKNOWN_FIELD: string;
-  STRING_INDEX_BASED_ON_INVALID_FIELD: string;
-  STRING_INDEX_EXPRESSION_TOO_LONG: string;
-  STRING_INVALID_INDEX_TYPE: string;
-  STRING_CANNOT_OPEN_INDEX: string;
-  STRING_TOO_MANY_INDEXES: string;
-  STRING_INDEX_NOT_EXIST: string;
-  STRING_NEED_EXCLUSIVE_ACCESS: string;
+{$I dbf_common.inc}
+{$I dbf_str.inc}
 
 implementation
 
@@ -52,3 +32,4 @@ initialization
   STRING_INDEX_NOT_EXIST              := 'Index "%s" bestaat niet.';
   STRING_NEED_EXCLUSIVE_ACCESS        := 'Exclusieve toegang is vereist voor deze actie.';
 end.
+

fcl/db/dbase/dbf_str_pl.pas

@@ -2,8 +2,8 @@ unit dbf_str;
 
 interface
 
-{$I Dbf_Common.inc}
-{$I Dbf_Str.inc}
+{$I dbf_common.inc}
+{$I dbf_str.inc}
 
 implementation
 
@@ -33,3 +33,4 @@ initialization
   STRING_INDEX_NOT_EXIST              := 'Brak indeksu "%s".';
   STRING_NEED_EXCLUSIVE_ACCESS        := 'Operacja wymaga dostêpu w trybie Exclusive.';
 end.
+

fcl/db/dbase/dbf_str_pt.pas

@@ -4,8 +4,8 @@ unit dbf_str;
 
 interface
 
-{$I Dbf_Common.inc}
-{$I Dbf_Str.inc}
+{$I dbf_common.inc}
+{$I dbf_str.inc}
 
 implementation
 

fcl/db/dbase/dbf_str_ru.pas

@@ -7,8 +7,8 @@ unit dbf_str_ru;
 
 interface
 
-{$I Dbf_Common.inc}
-{$I Dbf_Str.inc}
+{$I dbf_common.inc}
+{$I dbf_str.inc}
 
 implementation
 
@@ -37,3 +37,4 @@ initialization
   STRING_INDEX_NOT_EXIST              := 'Èíäåêñ "%s" íå ñóùåñòâóåò.';
   STRING_NEED_EXCLUSIVE_ACCESS        := 'Íåâîçìîæíî âûïîëíèòü - ñíà÷àëà íóæíî ïîëó÷èòü ìîíîïîëüíûé äîñòóï.';
 end.
+

fcl/db/dbase/dbf_wtil.pas

@@ -1,6 +1,6 @@
 unit dbf_wtil;
 
-{$i Dbf_Common.inc}
+{$I dbf_common.inc}
 
 interface
 
@@ -9,7 +9,7 @@ uses
 {$ifdef FPC}
   BaseUnix,
 {$else}
-  Libc,
+  Libc, 
 {$endif}
   Types, SysUtils, Classes;
 
@@ -202,9 +202,9 @@ const
 *)
 {$ifdef FPC}
   ERROR_LOCK_VIOLATION = ESysEACCES;
-{$else}
+{$else}  
   ERROR_LOCK_VIOLATION = EACCES;
-{$endif}
+{$endif}  
 
 { MBCS and Unicode Translation Flags. }
   MB_PRECOMPOSED = 1; { use precomposed chars }
@@ -403,9 +403,9 @@ const
   L_XTND          = SEEK_END;
 *)
 
-const
 
-{$IFDEF FPC}
+{$ifdef FPC}
+const
    F_RDLCK = 0;
    F_WRLCK = 1;
    F_UNLCK = 2;
@@ -424,7 +424,7 @@ const
 
    EACCES = ESysEACCES;
    EAGAIN = ESysEAGAIN;
-{$ENDIF}
+{$endif}
 
 function LockFile(hFile: THandle; dwFileOffsetLow, dwFileOffsetHigh: DWORD; nNumberOfBytesToLockLow, nNumberOfBytesToLockHigh: DWORD): BOOL;
 var
@@ -488,40 +488,124 @@ end;
 
 function GetOEMCP: Cardinal;
 begin
+{$ifdef HUNGARIAN}
+  Result := 852;
+{$else}
   Result := $FFFFFFFF;
+{$endif}
 end;
 
 function GetACP: Cardinal;
 begin
+{$ifdef HUNGARIAN}
+  Result := 1250;
+{$else}
   Result := 1252;
+{$endif}
+end;
+
+{$ifdef HUNGARIAN}
+
+procedure OemHunHun(AnsiDst: PChar; cchDstLength: DWORD);
+var
+  Count: DWORD;
+begin
+  if Assigned(AnsiDst) and (cchDstLength<>0) then
+  begin
+    for Count:=0 to Pred(cchDstLength) do
+    begin
+      case AnsiDst^ of
+        #160:      AnsiDst^:= #225; {á}
+        #143,#181: AnsiDst^:= #193; {Á}
+        #130:      AnsiDst^:= #233; {é}
+        #144:      AnsiDst^:= #201; {É}
+        #161:      AnsiDst^:= #237; {í}
+        #141,#214: AnsiDst^:= #205; {Í}
+        #162:      AnsiDst^:= #243; {ó}
+        #149,#224: AnsiDst^:= #211; {Ó}
+        #148:      AnsiDst^:= #246; {ö}
+        #153:      AnsiDst^:= #214; {Ö}
+        #147,#139: AnsiDst^:= #245; {õ}
+        #167,#138: AnsiDst^:= #213; {Õ}
+        #163:      AnsiDst^:= #250; {ú}
+        #151,#233: AnsiDst^:= #218; {Ú}
+        #129:      AnsiDst^:= #252; {ü}
+        #154:      AnsiDst^:= #220; {Ü}
+        #150,#251: AnsiDst^:= #251; {û}
+        #152,#235: AnsiDst^:= #219; {Û}
+      end;
+      Inc(AnsiDst);
+    end;
+  end;
+end;
+
+procedure AnsiHunHun(AnsiDst: PChar; cchDstLength: DWORD);
+var
+  Count: DWORD;
+begin
+  if Assigned(AnsiDst) and (cchDstLength<>0) then
+  begin
+    for Count:=0 to Pred(cchDstLength) do
+    begin
+      case AnsiDst^ of
+        #225:      AnsiDst^:= #160; {á}
+        #193:      AnsiDst^:= #181; {Á}
+        #233:      AnsiDst^:= #130; {é}
+        #201:      AnsiDst^:= #144; {É}
+        #237:      AnsiDst^:= #161; {í}
+        #205:      AnsiDst^:= #214; {Í}
+        #243:      AnsiDst^:= #162; {ó}
+        #211:      AnsiDst^:= #224; {Ó}
+        #246:      AnsiDst^:= #148; {ö}
+        #214:      AnsiDst^:= #153; {Ö}
+        #245:      AnsiDst^:= #139; {õ}
+        #213:      AnsiDst^:= #138; {Õ}
+        #250:      AnsiDst^:= #163; {ú}
+        #218:      AnsiDst^:= #233; {Ú}
+        #252:      AnsiDst^:= #129; {ü}
+        #220:      AnsiDst^:= #154; {Ü}
+        #251:      AnsiDst^:= #251; {û}
+        #219:      AnsiDst^:= #235; {Û}
+      end;
+      Inc(AnsiDst);
+    end;
+  end;
 end;
 
+{$endif}
+
 function OemToChar(lpszSrc: PChar; lpszDst: PChar): BOOL;
 begin
   if lpszDst <> lpszSrc then
     StrCopy(lpszDst, lpszSrc);
-  Result := TRUE;
+  Result := true;
 end;
 
 function CharToOem(lpszSrc: PChar; lpszDst: PChar): BOOL;
 begin
   if lpszDst <> lpszSrc then
     StrCopy(lpszDst, lpszSrc);
-  Result := TRUE;
+  Result := true;
 end;
 
 function OemToCharBuff(lpszSrc: PChar; lpszDst: PChar; cchDstLength: DWORD): BOOL;
 begin
   if lpszDst <> lpszSrc then
     StrLCopy(lpszDst, lpszSrc, cchDstLength);
-  Result := TRUE;
+{$ifdef HUNGARIAN}
+  OemHunHun(lpszDst, cchDstLength);
+{$endif}
+  Result := true;
 end;
 
 function CharToOemBuff(lpszSrc: PChar; lpszDst: PChar; cchDstLength: DWORD): BOOL;
 begin
   if lpszDst <> lpszSrc then
     StrLCopy(lpszDst, lpszSrc, cchDstLength);
-  Result := TRUE;
+{$ifdef HUNGARIAN}
+  AnsiHunHun(lpszDst, cchDstLength);
+{$endif}
+  Result := true;
 end;
 
 function MultiByteToWideChar(CodePage: DWORD; dwFlags: DWORD; const lpMultiByteStr: LPCSTR; cchMultiByte: Integer; lpWideCharStr: LPWSTR; cchWideChar: Integer): Integer;
@@ -563,7 +647,7 @@ begin
   Result := True;
 end;
 
-function GetUserDefaultLCID: LCID; stdcall;
+function GetUserDefaultLCID: LCID;
 begin
   Result := LANG_ENGLISH or (SUBLANG_ENGLISH_UK shl 10);
 end;

fcl/db/dbase/tdbf_l.pas

@@ -3,19 +3,19 @@
   the package tdbf_l 0.0.
 }
 
-unit tdbf_l;
+unit tdbf_l; 
 
 interface
 
 uses
-  Dbf, Dbf_Reg, LazarusPackageIntf;
+  dbf, dbf_reg, LazarusPackageIntf; 
 
 implementation
 
-procedure Register;
+procedure Register; 
 begin
-  RegisterUnit('Dbf', @Dbf_Reg.Register);
-end;
+  RegisterUnit('Dbf', @dbf_reg.Register); 
+end; 
 
 initialization
   RegisterPackage('tdbf_l', @Register)