--- oup/rewrite/DataAccess/DataAccess.pas 2007/02/20 20:43:29 101 +++ oup/rewrite/DataAccess/DataAccess.pas 2007/02/21 00:29:27 105 @@ -41,7 +41,6 @@ type procedure LoadDatFilePart(FileID, Offset, Size: Integer; var Target: TByteData); overload; procedure LoadDatFilePart(FileID, Offset, Size: Integer; Target: Pointer); overload; procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TStream); overload; virtual; abstract; - procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TByteData); overload; procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: Pointer); overload; function GetRawList(FileID: Integer): TRawDataList; virtual; abstract; @@ -55,11 +54,10 @@ type procedure LoadRawFilePart(FileID, DatOffset, Offset, Size: Integer; var Target: TByteData); overload; procedure LoadRawFilePart(FileID, DatOffset, Offset, Size: Integer; Target: Pointer); overload; procedure UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TStream); overload; virtual; abstract; - procedure UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TByteData); overload; procedure UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: Pointer); overload; - function AppendRawFile(LocSep: Boolean; Size: Integer; Src: TStream): Integer; overload; virtual; - function AppendRawFile(LocSep: Boolean; Size: Integer; Src: TByteData): Integer; overload; + function AppendRawFile(LocSep: Boolean; Src: TStream): Integer; overload; virtual; + function AppendRawFile(LocSep: Boolean; Src: TByteData): Integer; overload; function AppendRawFile(LocSep: Boolean; Size: Integer; Src: Pointer): Integer; overload; published end; @@ -172,20 +170,6 @@ begin end; end; -procedure TDataAccess.UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TByteData); -var - data: TStream; -begin - if fileid < GetFileCount then - begin - data := TMemoryStream.Create; - data.Write(Src[0], Size); - data.Seek(0, soFromBeginning); - UpdateDatFilePart(FileID, offset, size, data); - data.Free; - end; -end; - procedure TDataAccess.UpdateDatFilePart(FileID, Offset, Size: Integer; Src: Pointer); var data: TStream; @@ -259,20 +243,6 @@ begin end; end; -procedure TDataAccess.UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TByteData); -var - data: TStream; -begin - if fileid < GetFileCount then - begin - data := TMemoryStream.Create; - data.Write(Src[0], Size); - data.Seek(0, soFromBeginning); - UpdateRawFilePart(FileID, DatOffset, Offset, Size, data); - data.Free; - end; -end; - procedure TDataAccess.UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: Pointer); var data: TStream; @@ -288,19 +258,20 @@ begin end; -function TDataAccess.AppendRawFile(LocSep: Boolean; Size: Integer; Src: TStream): Integer; +function TDataAccess.AppendRawFile(LocSep: Boolean; Src: TStream): Integer; begin raise ENotImplemented.Create('ERROR: AppendRawFile not implemented here!!!'); end; -function TDataAccess.AppendRawFile(LocSep: Boolean; Size: Integer; Src: TByteData): Integer; +function TDataAccess.AppendRawFile(LocSep: Boolean; Src: TByteData): Integer; var data: TStream; begin data := TMemoryStream.Create; - data.Write(Src[0], Size); - AppendRawFile(LocSep, Size, data); + data.Write(Src[0], Length(Src)); + data.Seek(0, soFromBeginning); + AppendRawFile(LocSep, data); data.Free; end; @@ -310,7 +281,8 @@ var begin data := TMemoryStream.Create; data.Write(Src^, Size); - AppendRawFile(LocSep, Size, data); + data.Seek(0, soFromBeginning); + AppendRawFile(LocSep, data); data.Free; end;