--- oup/rewrite/DataAccess/Access_OniArchive.pas	2007/01/18 17:15:59	93
+++ oup/current/DataAccess/Access_OniArchive.pas	2007/05/24 17:48:18	192
@@ -1,133 +1,81 @@
 unit Access_OniArchive;
 interface
 
-uses DataAccess, Classes;
+uses DataAccess, Classes, TypeDefs;
 
 type
-{
-  THeader = packed record
-    Ident:      array[0..$13] of Byte;
-    Files:      LongWord;
-    NamedFiles: LongWord;
-    Extensions: LongWord;
-    DataAddr:   LongWord;
-    DataSize:   LongWord;
-    NamesAddr:  LongWord;
-    NamesSize:  LongWord;
-    Ident2:     array[0..$F] of Byte;
-  end;
-  TFilesMap = array of packed record
-    Extension: array[0..$3] of Char;
-    DataAddr:  LongWord;
-    NameAddr:  LongWord;
-    FileSize:  LongWord;
-    FileType:  LongWord;
-  end;
-
-  TFileInfo = packed record
-    ID:      Integer;
-    FileName: String;
-    FileNameHex: String;
-    Extension: String[4];
-    Name:    String;
-    Size:    LongWord;
-    FileType: LongWord;
-    DatAddr: LongWord;
-    opened:  Boolean;
-  end;
-  TFiles = array of TFileInfo;
-
-  TNamedFilesMap = array of packed record
-    FileNumber: LongWord;
-    blubb:      LongWord;
-  end;
-  TExtensionsMap = array of packed record
-    Ident:     array[0..$7] of Byte;
-    Extension: array[0..$3] of Char;
-    ExtCount:  LongWord;
-  end;
-}
-
   TAccess_OniArchive = class(TDataAccess)
   private
-{    Fdat_file:     TFileStream;
-    Fraw_file:     TFileStream;
-    Fsep_file:     TFileStream;
-    Fdat_header:   THeader;
-    Fdat_filesmap: TFilesMap;
-    Fdat_files:    TFiles;
-    Fdat_namedfilesmap: TNamedFilesMap;
-    Fdat_extensionsmap: TExtensionsMap;
-    FUnloadWhenUnused: Boolean;
-    FDatOpened:    Boolean;
-    FRawOpened:    Boolean;
-    FSepOpened:    Boolean;
+    Fdat_file:           TFileStream;
+    Fraw_file:           TFileStream;
+    Fsep_file:           TFileStream;
+    Fdat_files:          TFiles;
+    Fdat_extensionsmap:  TExtensionsMap;
+    FUnloadWhenUnused:   Boolean;
+    FDatOpened:          Boolean;
+    FRawOpened:          Boolean;
+    FSepOpened:          Boolean;
   protected
   public
     property UnloadWhenUnused: Boolean Read FUnloadWhenUnused Write FUnloadWhenUnused;
 
-    constructor Create(DatFilename: String; var Result: Boolean); override;
+    constructor Create(DatFilename: String; ConnectionID: Integer; var Msg: TStatusMessages); override;
     procedure Close; override;
 
-    function GetFileInfo(fileid: Integer): TFileInfo; override;
-    function GetFilesList(ext: String; pattern: String;
-      NoEmptyFiles: Boolean; sort: TSortType): TStringArray; override;
-    function GetFilesCount: LongWord; override;
-    function GetExtensionsList: TStringArray; override;
-    function GetExtendedExtensionsList: TExtensionsMap; override;
-
-    function LoadDatFile(fileid: LongWord): Tdata; override;
-    procedure UpdateDatFile(fileid: LongWord; Data: Tdata); override;
-    procedure LoadDatFilePart(fileid, offset, size: LongWord; target: Pointer); override;
-    procedure UpdateDatFilePart(fileid, offset, size: LongWord; target: Pointer); override;
-
-    procedure LoadRawOffset(loc_sep: Boolean; raw_addr, size: LongWord; target: Pointer);
-    function GetRawList(fileid: LongWord): TRawList; override;
-    procedure LoadRawFile(fileid, dat_offset: LongWord; target: Pointer); override;
-    procedure UpdateRawFile(fileid, dat_offset: LongWord; size: LongWord;
-      target: Pointer); override;
-    procedure LoadRawFilePart(fileid, dat_offset: LongWord;
-      offset, size: LongWord; target: Pointer); override;
-    procedure UpdateRawFilePart(fileid, dat_offset: LongWord;
-      offset, size: LongWord; target: Pointer); override;
-    function AppendRawFile(loc_sep: Boolean; size: LongWord; target: Pointer): LongWord;
-      override;//Returns new Address
+    function GetFileInfo(FileID: Integer): TFileInfo; override;
+    function GetFilesList(Ext: String; Pattern: String;
+      NoEmptyFiles: Boolean; SortType: TSortType): TStrings; override;
+    function GetFileCount: Integer; override;
+    function GetExtensionsList(ExtListFormat: TExtensionFormat): TStrings; override;
+
+    procedure LoadDatFile(FileID: Integer; var Target: TStream); overload; override;
+    procedure UpdateDatFile(FileID: Integer; Src: TStream); overload; override;
+    procedure LoadDatFilePart(FileID, Offset, Size: Integer; var Target: TStream); overload; override;
+    procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TStream); overload; override;
+
+    function GetDatLinks(FileID: Integer): TDatLinkList; override;
+    function GetDatLink(FileID, DatOffset: Integer): TDatLink; override;
+    function GetRawList(FileID: Integer): TRawDataList; override;
+    function GetRawInfo(FileID, DatOffset: Integer): TRawDataInfo; override;
+
+    procedure LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; var target: TStream); overload;
+    procedure LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; target: Pointer); overload;
+    procedure LoadRawFile(FileID, DatOffset: Integer; var Target: TStream); overload; override;
+    procedure UpdateRawFile(FileID, DatOffset: Integer; Src: TStream); overload; override;
+    procedure LoadRawFilePart(FileID, DatOffset, Offset, Size: Integer; var Target: TStream); overload; override;
+    procedure UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TStream); overload; override;
+
+    function AppendRawFile(LocSep: Boolean; Src: TStream): Integer; overload; override;
   published
-}  end;
+  end;
 
 implementation
 
+uses
+  SysUtils, StrUtils, Data, Functions, RawList, DatLinks, Math;
+
 
 (*
 ================================================================================
                       Implementation of  TOniDataDat
 *)
 
-{
-constructor TOniDataDat.Create(DatFilename: String; var Result: Boolean);
-const
-  header_ident1_pc: array[0..$13] of Byte =
-    ($1F, $27, $DC, $33, $DF, $BC, $03, $00, $31, $33, $52, $56, $40, $00,
-    $14, $00, $10, $00, $08, $00);
-  header_ident1_mac: array[0..$13] of Byte =
-    ($61, $30, $C1, $23, $DF, $BC, $03, $00, $31, $33, $52, $56, $40, $00,
-    $14, $00, $10, $00, $08, $00);
-  header_ident1_macbeta: array[0..$13] of Byte =
-    ($81, $11, $8D, $23, $DF, $BC, $03, $00, $31, $33, $52, $56, $40, $00,
-    $14, $00, $10, $00, $08, $00);
-  header_ident2: array[0..$F] of Byte =
-    ($99, $CF, $40, $00, $90, $4F, $63, $00, $F4, $55, $5F, $00, $90, $4F, $63, $00);
+
+constructor TAccess_OniArchive.Create(DatFilename: String; ConnectionID: Integer; var Msg: TStatusMessages);
 var
-  i: LongWord;
-  header_pc, header_mac: Boolean;
+  i: Integer;
+  header_pc, header_mac, header_macbeta: Boolean;
+  Fdat_header:   THeader;
+  Fdat_filesmap: TFilesMap;
+  Fdat_namedfilesmap: TNamedFilesMap;
 begin
   FUnloadWhenUnused := True;
   FDatOpened := False;
   FRawOpened := False;
+  Msg := SM_UnknownError;
   if not FileExists(DatFilename) then
   begin
-    ShowMessage('File doesn''t exist!!!');
-    Result := False;
+    Msg := SM_FileNotFound;
     Exit;
   end;
   FFileName := DatFilename;
@@ -135,25 +83,36 @@ begin
   Fdat_file.Read(Fdat_header, SizeOf(Fdat_header));
   header_pc  := True;
   header_mac := True;
-  for i := 0 to High(Fdat_header.Ident) do
+  header_macbeta := True;
+  for i := 0 to High(Fdat_header.GlobalIdent) do
+    if Fdat_header.GlobalIdent[i] <> HeaderGlobalIdent[i] then
+    begin
+      Msg := SM_IncompatibleFile;
+      Exit;
+    end;
+
+  for i := 0 to High(Fdat_header.OSIdent) do
   begin
-    FLevelInfo.Ident[i] := Fdat_header.Ident[i];
-    if Fdat_header.Ident[i] <> header_ident1_pc[i] then
+    if Fdat_header.OSIdent[i] <> HeaderOSIdentWin[i] then
       header_pc := False;
-    if Fdat_header.Ident[i] <> header_ident1_mac[i] then
+    if Fdat_header.OSIdent[i] <> HeaderOSIdentMac[i] then
       header_mac := False;
+    if Fdat_header.OSIdent[i] <> HeaderOSIdentMacBeta[i] then
+      header_macbeta := False;
   end;
-  if not (header_pc xor header_mac) then
+  if not (header_pc xor header_mac xor header_macbeta) then
   begin
-    Result := False;
+    Msg := SM_IncompatibleFile;
     Exit;
   end
   else
   begin
-    if (header_pc and not header_mac) then
-      Fos_mac := False
-    else
-      Fos_mac := True;
+    if (header_pc and not header_mac and not header_macbeta) then
+      FDataOS := DOS_WIN
+    else if (not header_pc and header_mac and not header_macbeta) then
+      FDataOS := DOS_MAC
+    else if (not header_pc and not header_mac and header_macbeta) then
+      FDataOS := DOS_MACBETA;
   end;
   SetLength(Fdat_filesmap, Fdat_header.Files);
   SetLength(Fdat_files, Fdat_header.Files);
@@ -179,10 +138,6 @@ begin
     begin
       Fdat_files[i].Name := '';
     end;
-    Fdat_files[i].FileName    :=
-      FormatNumber(i, 5, '0') + '-' + Fdat_files[i].Name + '.' + Fdat_files[i].Extension;
-    Fdat_files[i].FileNameHex :=
-      IntToHex(i, 4) + '-' + Fdat_files[i].Name + '.' + Fdat_files[i].Extension;
   end;
   Fdat_file.Seek($40 + Fdat_header.Files * $14, soFromBeginning);
   SetLength(Fdat_namedfilesmap, Fdat_header.NamedFiles);
@@ -195,25 +150,27 @@ begin
     Fdat_file.Read(Fdat_extensionsmap[i], SizeOf(Fdat_extensionsmap[i]));
 
   Fdat_file.Seek(Fdat_files[0].DatAddr + 7, soFromBeginning);
-  Fdat_file.Read(FLevelInfo.LevelNumber, 1);
-  FLevelInfo.LevelNumber := FLevelInfo.LevelNumber div 2;
+  Fdat_file.Read(FLevelNumber, 1);
+  FLevelNumber := FLevelNumber div 2;
 
   Fdat_file.Free;
 
-  Result   := True;
-  FBackend := ODB_Dat;
+  Msg := SM_OK;
+  FBackend := DB_ONI;
+  FConnectionID := ConnectionID;
+  FChangeRights := [CR_EditDat, CR_EditRaw, CR_AppendRaw];
 end;
 
 
 
 
-procedure TOniDataDat.Close;
+procedure TAccess_OniArchive.Close;
 begin
-  if not FUnloadWhenUnused and FDatOpened then
+  if FDatOpened then
     Fdat_file.Free;
-  if not FUnloadWhenUnused and FRawOpened then
+  if FRawOpened then
     Fraw_file.Free;
-  if not FUnloadWhenUnused and FSepOpened then
+  if FSepOpened then
     Fsep_file.Free;
   Self.Free;
 end;
@@ -221,14 +178,14 @@ end;
 
 
 
-function TOniDataDat.GetFileInfo(fileid: Integer): TFileInfo;
+function TAccess_OniArchive.GetFileInfo(fileid: Integer): TFileInfo;
 begin
   if fileid = -1 then
   begin
     Result := inherited GetFileInfo(fileid);
     Exit;
   end;
-  if fileid < Self.GetFilesCount then
+  if fileid < Self.GetFileCount then
     Result    := Fdat_files[fileid]
   else
     Result.ID := -1;
@@ -237,41 +194,47 @@ end;
 
 
 
-function TOniDataDat.GetFilesList(ext: String; pattern: String;
-  NoEmptyFiles: Boolean; sort: TSortType): TStringArray;
+function TAccess_OniArchive.GetFilesList(ext: String; pattern: String;
+  NoEmptyFiles: Boolean; SortType: TSortType): TStrings;
 var
-  i: LongWord;
-  list: TStringList;
+  i:      Integer;
+  list:   TStringList;
   id, name, extension: String;
   fields: TStrings;
 
   procedure getfields;
   begin
-     fields.CommaText := StringReplace(AnsiQuotedStr(list.Strings[i], '"'), ';', '","', [rfReplaceAll]);
-    if sort in [stIDAsc, stIDDesc] then
+    fields.CommaText := StringReplace(AnsiQuotedStr(list.Strings[i], '"'), ';', '","', [rfReplaceAll]);
+    if SortType in [ST_IDAsc, ST_IDDesc] then
     begin
       id := fields.Strings[0];
       name := fields.Strings[1];
       extension := fields.Strings[2];
     end;
-    if sort in [stNameAsc, stNameDesc] then
+    if SortType in [ST_NameAsc, ST_NameDesc] then
     begin
       id := fields.Strings[1];
       name := fields.Strings[0];
       extension := fields.Strings[2];
     end;
-    if sort in [stExtAsc, stExtDesc] then
+    if SortType in [ST_ExtAsc, ST_ExtDesc] then
     begin
       id := fields.Strings[1];
       name := fields.Strings[2];
       extension := fields.Strings[0];
     end;
+    if SortType in [ST_ExtNameAsc, ST_ExtNameDesc] then
+    begin
+      id := fields.Strings[2];
+      name := fields.Strings[1];
+      extension := fields.Strings[0];
+    end;
   end;
 
 begin
   list := TStringList.Create;
   list.Sorted := True;
-  for i := 0 to Fdat_header.Files - 1 do
+  for i := 0 to GetFileCount - 1 do
   begin
     if ((Length(ext) = 0) or (Pos(Fdat_files[i].Extension, ext) > 0)) and
       ((Length(pattern) = 0) or
@@ -279,36 +242,35 @@ begin
     begin
       if (NoEmptyFiles = False) or ((Fdat_files[i].FileType and $02) = 0) then
       begin
-        if AppSettings.FilenumbersAsHex then
-          id := IntToHex(Fdat_files[i].ID, 4)
-        else
-          id := FormatNumber(Fdat_files[i].ID, 5, '0');
+        id := FormatNumber(Fdat_files[i].ID, 5, '0');
         name := Fdat_files[i].Name;
         extension := Fdat_files[i].Extension;
 
-        case sort of
-          stIDAsc, stIDDesc:     list.Add(id + ';' + name + ';' + extension);
-          stNameAsc, stNameDesc: list.Add(name + ';' + id + ';' + extension);
-          stExtAsc, stExtDesc:   list.Add(extension + ';' + id + ';' + name);
+        case SortType of
+          ST_IDAsc, ST_IDDesc:     list.Add(id + ';' + name + ';' + extension);
+          ST_NameAsc, ST_NameDesc: list.Add(name + ';' + id + ';' + extension);
+          ST_ExtAsc, ST_ExtDesc:   list.Add(extension + ';' + id + ';' + name);
+          ST_ExtNameAsc, ST_ExtNameDesc: list.Add(name + ';' + extension + ';' + id);
         end;
       end;
     end;
   end;
-  SetLength(Result, list.Count);
-  if Length(Result) > 0 then
+  if not Assigned(Result) then
+    Result := TStringList.Create;
+  if list.Count > 0 then
   begin
     fields := TStringList.Create;
-    if sort in [stIDAsc, stNameAsc, stExtAsc] then
+    if SortType in [ST_IDAsc, ST_NameAsc, ST_ExtAsc, ST_ExtNameAsc] then
       for i := 0 to list.Count - 1 do
       begin
         getfields;
-        Result[i] := id + '-' + name + '.' + extension;
+        Result.Add(id + '-' + name + '.' + extension);
       end
     else
       for i := list.Count - 1 downto 0 do
       begin
         getfields;
-        Result[list.Count - i - 1] := id + '-' + name + '.' + extension;
+        Result.Add(id + '-' + name + '.' + extension);
       end;
     fields.Free;
   end;
@@ -318,111 +280,118 @@ end;
 
 
 
-function TOniDataDat.GetFilesCount: LongWord;
+function TAccess_OniArchive.GetFileCount: Integer;
 begin
-  Result := Fdat_header.Files;
+  Result := Length(Fdat_files);
 end;
 
 
 
 
-function TOniDataDat.GetExtensionsList: TStringArray;
+function TAccess_OniArchive.GetExtensionsList(ExtListFormat: TExtensionFormat): TStrings;
 var
-  i: LongWord;
+  i: Integer;
 begin
-  SetLength(Result, Fdat_header.Extensions);
-  for i := 0 to Fdat_header.Extensions - 1 do
+  if not Assigned(Result) then
+    Result := TStringList.Create;
+  if Result is TStringList then
+    TStringList(Result).Sorted := True;
+  for i := 0 to Length(Fdat_extensionsmap) - 1 do
   begin
     with Fdat_extensionsmap[i] do
     begin
-      Result[i] := Extension[3] + Extension[2] + Extension[1] + Extension[0] +
-        ' (' + IntToStr(ExtCount) + ')';
+      case ExtListFormat of
+        EF_ExtOnly:
+          Result.Add(Extension[3] + Extension[2] + Extension[1] + Extension[0]);
+        EF_ExtCount:
+          Result.Add(Extension[3] + Extension[2] + Extension[1] + Extension[0] +
+                ' (' + IntToStr(ExtCount) + ')');
+      end;
     end;
   end;
 end;
 
 
 
-
-function TOniDataDat.GetExtendedExtensionsList: TExtensionsMap;
+procedure TAccess_OniArchive.LoadDatFile(FileID: Integer; var Target: TStream);
 var
-  i: LongWord;
+  streampos: Integer;
 begin
-  SetLength(Result, Fdat_header.Extensions);
-  for i := 0 to Fdat_header.Extensions - 1 do
+  if fileid < GetFileCount then
   begin
-    Result[i] := Fdat_extensionsmap[i];
-  end;
-end;
-
-
-
-
-function TOniDataDat.LoadDatFile(fileid: LongWord): Tdata;
-begin
-  if fileid < Self.GetFilesCount then
-  begin
-    if FUnloadWhenUnused or not FDatOpened then
+    if not Assigned(Target) then
+      Target := TMemoryStream.Create;
+    if not FDatOpened then
       Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
     Fdat_file.Seek(Fdat_files[fileid].DatAddr, soFromBeginning);
-    SetLength(Result, Fdat_files[fileid].Size);
-    Fdat_file.Read(Result[0], Fdat_files[fileid].Size);
+    streampos := Target.Position;
+    Target.CopyFrom(Fdat_file, Fdat_files[fileid].Size);
+    Target.Seek(streampos, soFromBeginning);
     if UnloadWhenUnused then
-      Fdat_file.Free
+    begin
+      Fdat_file.Free;
+      FDatOpened := False;
+    end
     else
       FDatOpened := True;
   end;
 end;
 
-
-
-
-procedure TOniDataDat.UpdateDatFile(fileid: LongWord; Data: Tdata);
+procedure TAccess_OniArchive.UpdateDatFile(FileID: Integer; Src: TStream);
 begin
-  if fileid < Self.GetFilesCount then
+  if fileid < GetFileCount then
   begin
-    if FUnloadWhenUnused or not FDatOpened then
+    if not FDatOpened then
       Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
     Fdat_file.Seek(Fdat_files[fileid].DatAddr, soFromBeginning);
-    Fdat_file.Write(Data[0], Length(Data));
+    Fdat_file.CopyFrom(Src, Fdat_files[fileid].Size);
     if UnloadWhenUnused then
-      Fdat_file.Free
+    begin
+      Fdat_file.Free;
+      FDatOpened := False;
+    end
     else
       FDatOpened := True;
   end;
 end;
 
-
-
-
-procedure TOniDataDat.LoadDatFilePart(fileid, offset, size: LongWord; target: Pointer);
+procedure TAccess_OniArchive.LoadDatFilePart(FileID, Offset, Size: Integer; var Target: TStream);
+var
+  streampos: Integer;
 begin
-  if fileid < Self.GetFilesCount then
+  if fileid < GetFileCount then
   begin
-    if FUnloadWhenUnused or not FDatOpened then
+    if not Assigned(Target) then
+      Target := TMemoryStream.Create;
+    if not FDatOpened then
       Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
     Fdat_file.Seek(Fdat_files[fileid].DatAddr + offset, soFromBeginning);
-    Fdat_file.Read(target^, size);
+    streampos := Target.Position;
+    Target.CopyFrom(Fdat_file, size);
+    Target.Seek(streampos, soFromBeginning);
     if UnloadWhenUnused then
-      Fdat_file.Free
+    begin
+      FDatOpened := False;
+      Fdat_file.Free;
+    end
     else
       FDatOpened := True;
   end;
 end;
 
-
-
-
-procedure TOniDataDat.UpdateDatFilePart(fileid, offset, size: LongWord; target: Pointer);
+procedure TAccess_OniArchive.UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TStream);
 begin
-  if fileid < Self.GetFilesCount then
+  if fileid < GetFileCount then
   begin
-    if FUnloadWhenUnused or not FDatOpened then
+    if not FDatOpened then
       Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
     Fdat_file.Seek(Fdat_files[fileid].DatAddr + offset, soFromBeginning);
-    Fdat_file.Write(target^, size);
+    Fdat_file.CopyFrom(Src, Size);
     if UnloadWhenUnused then
-      Fdat_file.Free
+    begin
+      Fdat_file.Free;
+      FDatOpened := False;
+    end
     else
       FDatOpened := True;
   end;
@@ -430,80 +399,130 @@ end;
 
 
 
+function TAccess_OniArchive.GetDatLink(FileID, DatOffset: Integer): TDatLink;
+var
+  link: Integer;
+begin
+  Result := DatLinksManager.GetDatLink(FConnectionID, FileID, DatOffset);
+  LoadDatFilePart(fileid, Result.SrcOffset, 4, @link);
+  if link > 0 then
+    Result.DestID := link div 256
+  else
+    Result.DestID := -1;
+end;
+
 
-function TOniDataDat.GetRawList(fileid: LongWord): TRawList;
+function TAccess_OniArchive.GetDatLinks(FileID: Integer): TDatLinkList;
 var
-  i: LongWord;
+  i: Integer;
+  link: Integer;
 begin
-  SetLength(Result, 0);
-  for i := 0 to High(RawListHandlers) do
-    if UpperCase(RawListHandlers[i].Ext) = UpperCase(Fdat_files[fileid].extension) then
-      if RawListHandlers[i].needed then
-      begin
-        Result := RawListHandlers[i].Handler(Self, fileid);
-        Break;
-      end
+  Result := DatLinksManager.GetDatLinks(FConnectionID, FileID);
+  if Length(Result) > 0 then
+  begin
+    for i := 0 to High(Result) do
+    begin
+      LoadDatFilePart(fileid, Result[i].SrcOffset, 4, @link);
+      if link > 0 then
+        Result[i].DestID := link div 256
       else
-        Break;
+        Result[i].DestID := -1;
+    end;
+  end;
+end;
+
+
+function TAccess_OniArchive.GetRawList(FileID: Integer): TRawDataList;
+begin
+  Result := RawLists.GetRawList(FConnectionID, FileID);
 end;
 
 
+function TAccess_OniArchive.GetRawInfo(FileID, DatOffset: Integer): TRawDataInfo;
+begin
+  Result := RawLists.GetRawInfo(FConnectionID, FileID, DatOffset);
+end;
+
 
 
-procedure TOniDataDat.LoadRawOffset(loc_sep: Boolean; raw_addr, size: LongWord;
-  target: Pointer);
+procedure TAccess_OniArchive.LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; var target: TStream);
 begin
-  if not loc_sep then
+  if not Assigned(Target) then
+    Target := TMemoryStream.Create;
+  if not LocSep then
   begin
-    if FUnloadWhenUnused or not FRawOpened then
+    if not FRawOpened then
       Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
         fmOpenReadWrite);
-    if raw_addr <= Fraw_file.Size then
+    if RawAddr <= Fraw_file.Size then
     begin
-      Fraw_file.Seek(raw_addr, soFromBeginning);
-      Fraw_file.Read(target^, size);
+      Fraw_file.Seek(RawAddr, soFromBeginning);
+      Target.CopyFrom(Fraw_file, size);
+      Target.Seek(0, soFromBeginning);
     end;
     if UnloadWhenUnused then
-      Fraw_file.Free
+    begin
+      FRawOpened := False;
+      Fraw_file.Free;
+    end
     else
       FRawOpened := True;
   end
   else
   begin
-    if FUnloadWhenUnused or not FSepOpened then
+    if not FSepOpened then
       Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
         fmOpenReadWrite);
-    if raw_addr <= Fsep_file.Size then
+    if RawAddr <= Fsep_file.Size then
     begin
-      Fsep_file.Seek(raw_addr, soFromBeginning);
-      Fsep_file.Read(target^, size);
+      Fsep_file.Seek(RawAddr, soFromBeginning);
+      Target.CopyFrom(Fsep_file, size);
+      Target.Seek(0, soFromBeginning);
     end;
     if UnloadWhenUnused then
-      Fsep_file.Free
+    begin
+      FSepOpened := False;
+      Fsep_file.Free;
+    end
     else
       FSepOpened := True;
   end;
 end;
 
+procedure TAccess_OniArchive.LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; target: Pointer);
+var
+  data: TStream;
+begin
+  data := nil;
+  LoadRawOffset(LocSep, RawAddr, Size, data);
+  data.Read(Target^, Size);
+  data.Free;
+end;
 
-
-
-procedure TOniDataDat.LoadRawFile(fileid, dat_offset: LongWord; target: Pointer);
+procedure TAccess_OniArchive.LoadRawFile(FileID, DatOffset: Integer; var Target: TStream);
 var
-  raw_info: TRawInfo;
+  raw_info: TRawDataInfo;
+  streampos: Integer;
 begin
-  if fileid < Self.GetFilesCount then
+  if not Assigned(Target) then
+    Target := TMemoryStream.Create;
+  if fileid < GetFileCount then
   begin
-    raw_info := Self.GetRawInfo(fileid, dat_offset);
-    if not raw_info.loc_sep then
+    raw_info := Self.GetRawInfo(FileID, DatOffset);
+    if not raw_info.LocSep then
     begin
-      if FUnloadWhenUnused or not FRawOpened then
+      if not FRawOpened then
         Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
           fmOpenReadWrite);
-      Fraw_file.Seek(raw_info.raw_addr, soFromBeginning);
-      Fraw_file.Read(target^, raw_info.raw_size);
+      Fraw_file.Seek(raw_info.RawAddr, soFromBeginning);
+      streampos := Target.Position;
+      Target.CopyFrom(Fraw_file, raw_info.RawSize);
+      Target.Seek(streampos, soFromBeginning);
       if UnloadWhenUnused then
-        Fraw_file.Free
+      begin
+        FRawOpened := False;
+        Fraw_file.Free;
+      end
       else
         FRawOpened := True;
     end
@@ -512,152 +531,165 @@ begin
       if FUnloadWhenUnused or not FSepOpened then
         Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
           fmOpenReadWrite);
-      Fsep_file.Seek(raw_info.raw_addr, soFromBeginning);
-      Fsep_file.Read(target^, raw_info.raw_size);
+      Fsep_file.Seek(raw_info.RawAddr, soFromBeginning);
+      streampos := Target.Position;
+      Target.CopyFrom(Fsep_file, raw_info.RawSize);
+      Target.Seek(streampos, soFromBeginning);
       if UnloadWhenUnused then
-        Fsep_file.Free
+      begin
+        FSepOpened := False;
+        Fsep_file.Free;
+      end
       else
         FSepOpened := True;
     end;
   end;
 end;
 
-
-
-
-procedure TOniDataDat.UpdateRawFile(fileid, dat_offset: LongWord;
-  size: LongWord; target: Pointer);
+procedure TAccess_OniArchive.UpdateRawFile(FileID, DatOffset: Integer; Src: TStream);
 var
-  raw_info: TRawInfo;
+  raw_info: TRawDataInfo;
 begin
-  if fileid < Self.GetFilesCount then
+  if fileid < GetFileCount then
   begin
-    raw_info := Self.GetRawInfo(fileid, dat_offset);
-    if not raw_info.loc_sep then
+    raw_info := GetRawInfo(FileID, DatOffset);
+    if not raw_info.LocSep then
     begin
-      if FUnloadWhenUnused or not FRawOpened then
+      if not FRawOpened then
         Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
           fmOpenReadWrite);
-      Fraw_file.Seek(raw_info.raw_addr, soFromBeginning);
-      Fraw_file.Write(target^, raw_info.raw_size);
+      Fraw_file.Seek(raw_info.RawAddr, soFromBeginning);
+      Fraw_file.CopyFrom(Src, Min(raw_info.RawSize, Src.Size));
       if UnloadWhenUnused then
-        Fraw_file.Free
+      begin
+        FRawOpened := False;
+        Fraw_file.Free;
+      end
       else
         FRawOpened := True;
     end
     else
     begin
-      if FUnloadWhenUnused or not FSepOpened then
+      if not FSepOpened then
         Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
           fmOpenReadWrite);
-      Fsep_file.Seek(raw_info.raw_addr, soFromBeginning);
-      Fsep_file.Write(target^, raw_info.raw_size);
+      Fsep_file.Seek(raw_info.RawAddr, soFromBeginning);
+      Fsep_file.CopyFrom(Src, raw_info.RawSize);
       if UnloadWhenUnused then
-        Fsep_file.Free
+      begin
+        FSepOpened := False;
+        Fsep_file.Free;
+      end
       else
         FSepOpened := True;
     end;
   end;
 end;
 
-
-
-
-procedure TOniDataDat.LoadRawFilePart(fileid, dat_offset: LongWord;
-  offset, size: LongWord; target: Pointer);
+procedure TAccess_OniArchive.LoadRawFilePart(FileID, DatOffset, Offset, Size: Integer; var Target: TStream);
 var
-  raw_info: TRawInfo;
-  Data:     Tdata;
-  mem:      TMemoryStream;
+  Data: TStream;
+  streampos: Integer;
 begin
-  if fileid < Self.GetFilesCount then
+  if not Assigned(Target) then
+    Target := TMemoryStream.Create;
+  if fileid < Self.GetFileCount then
   begin
-    raw_info := Self.GetRawInfo(fileid, dat_offset);
-    SetLength(Data, raw_info.raw_size);
-    Self.LoadRawFile(fileid, dat_offset, @Data[0]);
-    mem := TMemoryStream.Create;
-    mem.Write(Data[offset], size);
-    mem.Read(target^, size);
-    mem.Free;
+    data := nil;
+    LoadRawFile(FileID, DatOffset, Data);
+    Data.Seek(Offset, soFromBeginning);
+    streampos := Target.Position;
+    Target.CopyFrom(Data, Size);
+    Target.Seek(streampos, soFromBeginning);
   end;
 end;
 
 
-
-
-procedure TOniDataDat.UpdateRawFilePart(fileid, dat_offset: LongWord;
-  offset, size: LongWord; target: Pointer);
+procedure TAccess_OniArchive.UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TStream);
 var
-  raw_info: TRawInfo;
+  raw_info: TRawDataInfo;
 begin
-  if fileid < Self.GetFilesCount then
+  if fileid < GetFileCount then
   begin
-    raw_info := Self.GetRawInfo(fileid, dat_offset);
-    if not raw_info.loc_sep then
+    raw_info := GetRawInfo(FileID, DatOffset);
+    if not raw_info.LocSep then
     begin
-      if FUnloadWhenUnused or not FRawOpened then
+      if not FRawOpened then
         Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
           fmOpenReadWrite);
-      Fraw_file.Seek(raw_info.raw_addr + offset, soFromBeginning);
-      Fraw_file.Write(target^, raw_info.raw_size);
+      Fraw_file.Seek(raw_info.RawAddr + Offset, soFromBeginning);
+      Fraw_file.CopyFrom(Src, Size);
       if UnloadWhenUnused then
-        Fraw_file.Free
+      begin
+        FRawOpened := False;
+        Fraw_file.Free;
+      end
       else
         FRawOpened := True;
     end
     else
     begin
-      if FUnloadWhenUnused or not FSepOpened then
+      if not FSepOpened then
         Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
           fmOpenReadWrite);
-      Fsep_file.Seek(raw_info.raw_addr + offset, soFromBeginning);
-      Fsep_file.Write(target^, raw_info.raw_size);
+      Fsep_file.Seek(raw_info.RawAddr + Offset, soFromBeginning);
+      Fsep_file.CopyFrom(Src, Size);
       if UnloadWhenUnused then
-        Fsep_file.Free
+      begin
+        FSepOpened := False;
+        Fsep_file.Free;
+      end
       else
         FSepOpened := True;
     end;
   end;
 end;
 
-
-
-
-function TOniDataDat.AppendRawFile(loc_sep: Boolean; size: LongWord;
-  target: Pointer): LongWord; //Returns new Address
+function TAccess_OniArchive.AppendRawFile(LocSep: Boolean; Src: TStream): Integer;
+const
+  EmptyBytes: Array[0..31] of Byte = (
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 );
 begin
-  if not loc_sep then
+  if not LocSep then
   begin
-    if FUnloadWhenUnused or not FRawOpened then
+    if not FRawOpened then
       Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
         fmOpenReadWrite);
+    if (Fraw_file.Size mod 32) > 0 then
+      Fraw_file.Write(EmptyBytes[0], 32 - (Fraw_file.Size mod 32));
     Result := Fraw_file.Size;
     Fraw_file.Seek(0, soFromEnd);
-    Fraw_file.Write(target^, size);
+    Fraw_file.CopyFrom(Src, Src.Size);
+    if (Fraw_file.Size mod 32) > 0 then
+      Fraw_file.Write(EmptyBytes[0], 32 - (Fraw_file.Size mod 32));
     if UnloadWhenUnused then
-      Fraw_file.Free
+    begin
+      FRawOpened := False;
+      Fraw_file.Free;
+    end
     else
       FRawOpened := True;
   end
   else
   begin
-    if FUnloadWhenUnused or not FSepOpened then
+    if not FSepOpened then
       Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
         fmOpenReadWrite);
+    if (Fsep_file.Size mod 32) > 0 then
+      Fsep_file.Write(EmptyBytes[0], 32 - (Fsep_file.Size mod 32));
     Result := Fsep_file.Size;
     Fsep_file.Seek(0, soFromEnd);
-    Fsep_file.Write(target^, size);
+    Fsep_file.CopyFrom(Src, Src.Size);
+    if (Fsep_file.Size mod 32) > 0 then
+      Fsep_file.Write(EmptyBytes[0], 32 - (Fsep_file.Size mod 32));
     if UnloadWhenUnused then
-      Fsep_file.Free
+    begin
+      FSepOpened := False;
+      Fsep_file.Free;
+    end
     else
       FSepOpened := True;
   end;
 end;
 
-
-}
-
-
-
-
 end.