Changeset 105

Timestamp:

Feb 21, 2007, 1:29:27 AM (18 years ago)

Author:

alloc

Message:

 

Location:

oup/rewrite

Files:

• DataAccess/Access_OUP_ADB.pas (modified) (1 diff)
• DataAccess/Access_OniArchive.pas (modified) (5 diffs)
• DataAccess/DataAccess.pas (modified) (7 diffs)
• Global/Functions.pas (modified) (10 diffs)
• Global/OniImgClass.pas (modified) (8 diffs)
• Global/RawList.pas (modified) (1 diff)
• Helper/LevelDB.dfm (moved) (moved from oup/rewrite/Helper/Helper_LevelDB.dfm )
• Helper/LevelDB.pas (moved) (moved from oup/rewrite/Helper/Helper_LevelDB.pas )
• Helper/ValueEdit.pas (modified) (1 diff)
• Main.dfm (modified) (1 diff)
• Main.pas (modified) (9 diffs)
• OniUnPacker.bdsproj (modified) (1 diff)
• OniUnPacker.dpr (modified) (2 diffs)
• Tools/BinEdit.dfm (modified) (1 diff)
• Tools/BinEdit.pas (modified) (1 diff)
• Tools/Extractor.dfm (modified) (1 diff)
• Tools/Extractor.pas (modified) (2 diffs)
• Tools/RawEdit.dfm (modified) (1 diff)
• Tools/RawEdit.pas (modified) (16 diffs)
• Tools/Template.dfm (modified) (2 diffs)
• Tools/Template.pas (modified) (2 diffs)
• Tools/TxmpReplace.dfm (modified) (1 diff)
• Tools/TxmpReplace.pas (modified) (5 diffs)
• _exe/OniUnPacker.exe (modified) ( previous)

oup/rewrite/DataAccess/Access_OUP_ADB.pas

@@ -103 +103 @@
   FBackend := DB_ADB;
 
+  FConnectionID := ConnectionID;
   FChangeRights := [CR_EditDat, CR_EditRaw, CR_ResizeDat, CR_ResizeRaw];
 

oup/rewrite/DataAccess/Access_OniArchive.pas

@@ -43 +43 @@
     procedure UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TStream); overload; override;
 
-    function AppendRawFile(LocSep: Boolean; Size: Integer; Src: TStream): Integer; overload; override;
+    function AppendRawFile(LocSep: Boolean; Src: TStream): Integer; overload; override;
   published
   end;
@@ -184 +184 @@
   Msg := SM_OK;
   FBackend := DB_ONI;
+  FConnectionID := ConnectionID;
   FChangeRights := [CR_EditDat, CR_EditRaw, CR_AppendRaw];
 end;
@@ -616 +617 @@
 end;
 
-function TAccess_OniArchive.AppendRawFile(LocSep: Boolean; Size: Integer; Src: TStream): Integer;
+function TAccess_OniArchive.AppendRawFile(LocSep: Boolean; Src: TStream): Integer;
 begin
   if not LocSep then
@@ -625 +626 @@
     Result := Fraw_file.Size;
     Fraw_file.Seek(0, soFromEnd);
-    Fraw_file.CopyFrom(Src, Size);
+    Fraw_file.CopyFrom(Src, Src.Size);
     if UnloadWhenUnused then
     begin
@@ -641 +642 @@
     Result := Fsep_file.Size;
     Fsep_file.Seek(0, soFromEnd);
-    Fsep_file.CopyFrom(Src, Size);
+    Fsep_file.CopyFrom(Src, Src.Size);
     if UnloadWhenUnused then
     begin

oup/rewrite/DataAccess/DataAccess.pas

@@ -42 +42 @@
     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;
 
@@ -56 +55 @@
     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
@@ -173 +171 @@
 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
@@ -260 +244 @@
 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);
+procedure TDataAccess.UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: Pointer);
+var
+  data: TStream;
+begin
+  if fileid < GetFileCount then
+  begin
+    data := TMemoryStream.Create;
+    data.Write(Src^, Size);
     data.Seek(0, soFromBeginning);
     UpdateRawFilePart(FileID, DatOffset, Offset, Size, data);
@@ -274 +258 @@
 end;
 
-procedure TDataAccess.UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: Pointer);
-var
-  data: TStream;
-begin
-  if fileid < GetFileCount then
-  begin
-    data := TMemoryStream.Create;
-    data.Write(Src^, Size);
-    data.Seek(0, soFromBeginning);
-    UpdateRawFilePart(FileID, DatOffset, Offset, Size, data);
-    data.Free;
-  end;
-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!!!');
@@ -295 +265 @@
 
 
-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;
@@ -311 +282 @@
   data := TMemoryStream.Create;
   data.Write(Src^, Size);
-  AppendRawFile(LocSep, Size, data);
+  data.Seek(0, soFromBeginning);
+  AppendRawFile(LocSep, data);
   data.Free;
 end;

oup/rewrite/Global/Functions.pas

@@ -11 +11 @@
 function Decode_Float(buffer: TByteData): Single;
 function Encode_Float(input: Single): TByteData;
+function IntToBin(Value: Byte): String;
 function DataToBin(Data: TByteData): String;
 function BinToInt(bin: String): Byte;
@@ -39 +40 @@
 
 
-
 function BoolToStr(bool: Boolean): String;
 begin
@@ -49 +49 @@
 
 
-
-
 function HexToLong(hex: String): LongWord;
 
@@ -76 +74 @@
 begin
   if NormalizeHexString(hex) then
-  begin
-    Result := StrToInt(hex);
-{
-    hex    := UpperCase(hex);
+    Result := StrToInt(hex)
+  else
     Result := 0;
-    for i := 1 to Length(hex) do
-    begin
-      Result := Result shl 4;
-      case hex[i] of
-        '0'..'9':
-          Result := Result + Ord(hex[i]) - 48;
-        'A'..'F':
-          Result := Result + Ord(hex[i]) - 55;
-        else
-          Result := 0;
-          Exit;
-      end;
-    end;
-}
-  end
-  else
-  begin
-    Result := 0;
-  end;
-end;
-
-
+end;
 
 
@@ -109 +84 @@
   Result := buffer[0] + buffer[1] * 256 + buffer[2] * 256 * 256 + buffer[3] * 256 * 256 * 256;
 end;
-
-
 
 
@@ -126 +99 @@
 
 
-
-
 function Decode_Float(buffer: TByteData): Single;
 var
@@ -139 +110 @@
 
 
-
-
 function Encode_Float(input: Single): TByteData;
 var
@@ -150 +119 @@
 
 
+function IntToBin(Value: Byte): String;
+var
+  i: Byte;
+begin
+  Result := '';
+  for i := 7 downto 0 do
+    Result := Result + IntToStr((Value shr i) and $01);
+end;
 
 
@@ -171 +148 @@
   end;
 end;
-
-
 
 
@@ -193 +168 @@
   end;
 end;
-
 
 

oup/rewrite/Global/OniImgClass.pas

@@ -39 +39 @@
     function GetImageDataSize(fading: Boolean): Integer;
 
-    function GetAsData: TByteData;
-    function GetAs32bit: TByteData;
+    procedure GetAsData(var Target: TStream); overload;
+    procedure GetAsData(var Target: TByteData); overload;
+    procedure GetAs32bit(var Target: TStream); overload;
+    procedure GetAs32bit(var Target: TByteData); overload;
+    procedure GetAsBMP(var Target: TStream); overload;
     procedure GetAsBMP(var Target: TByteData); overload;
-    procedure GetAsBMP(var Target: TStream); overload;
     function LoadFromBMP(filename: String): Boolean;
     function WriteToBMP(filename: String): Boolean;
-    function GetMipMappedImage(var faded: TByteData): Boolean;
+    function GetMipMappedImage(var Target: TStream): Boolean; overload;
+    function GetMipMappedImage(var Target: TByteData): Boolean; overload;
   published
   end;
@@ -369 +372 @@
   txmpimg.DecodeImage;
 //  txmpimg.WriteToBMP('C:\file.bmp');
-  txmpdata := txmpimg.GetAs32bit;
+  txmpimg.GetAs32bit(txmpdata);
 {    ShowMessage(IntToStr(txmpimg.Width)+'x'+IntToStr(txmpimg.Height));
     for i:=0 to High(txmpdata) do
@@ -615 +618 @@
 
 
-function TOniImage.GetAsData: TByteData;
+procedure TOniImage.GetAsData(var Target: TStream);
 var
   i:      Integer;
@@ -629 +632 @@
   else
     revert := False;
-  SetLength(Result, Length(Self.FData));
-  for i := 0 to High(Result) do
-    Result[i] := Self.FData[i];
+  if not Assigned(Target) then
+    Target := TMemoryStream.Create;
+  Target.Write(FData[0], Length(FData));
+  Target.Seek(0, soFromBeginning);
   if revert then
     Self.RevertImage;
 end;
 
-
-
-
-function TOniImage.GetAs32bit: TByteData;
-var
-  i: Integer;
+procedure TOniImage.GetAsData(var Target: TByteData);
+var
+  mem: TStream;
+begin
+  mem := TMemoryStream.Create;
+  GetAsData(mem);
+  SetLength(Target, mem.Size);
+  mem.Read(Target[0], mem.Size);
+  mem.Free;
+end;
+
+
+procedure TOniImage.GetAs32bit(var Target: TStream);
 begin
   if not (DT_Decoded32 in Self.FDataType) then
     Self.DecodeImage;
-  SetLength(Result, Length(Self.FData));
-  for i := 0 to High(Result) do
-    Result[i] := Self.FData[i];
-end;
-
-
+  if not Assigned(Target) then
+    Target := TMemoryStream.Create;
+  Target.Write(FData[0], Length(FData));
+  Target.Seek(0, soFromBeginning);
+end;
+
+procedure TOniImage.GetAs32bit(var Target: TByteData);
+var
+  mem: TStream;
+begin
+  mem := TMemoryStream.Create;
+  GetAs32bit(mem);
+  SetLength(Target, mem.Size);
+  mem.Read(Target[0], mem.Size);
+  mem.Free;
+end;
 
 
@@ -786 +807 @@
 
 
-
-function TOniImage.GetMipMappedImage(var faded: TByteData): Boolean;
+function TOniImage.GetMipMappedImage(var Target: TByteData): Boolean;
 var
   i:      Integer;
@@ -810 +830 @@
   x := Self.FWidth;
   y := Self.FHeight;
-  SetLength(faded, x * y * Self.FDepth div 8);
+  SetLength(Target, x * y * Self.FDepth div 8);
   SetLength(fadelvldata, x * y * Self.FDepth div 8);
-  for i := 0 to Length(faded) - 1 do
-  begin
-    faded[i] := Self.FData[i];
+  for i := 0 to Length(Target) - 1 do
+  begin
+    Target[i] := Self.FData[i];
     fadelvldata[i] := Self.FData[i];
   end;
@@ -821 +841 @@
     x := x div 2;
     y := y div 2;
-    SetLength(faded, Length(faded) + x * y * Self.FDepth div 8);
+    SetLength(Target, Length(Target) + x * y * Self.FDepth div 8);
     for i := 0 to Length(fadelvldata) - 1 do
-      faded[Length(faded) - x * y * Self.FDepth div 8 + i] := fadelvldata[i];
+      Target[Length(Target) - x * y * Self.FDepth div 8 + i] := fadelvldata[i];
   until (x = 1) or (y = 1) or ((x mod 2) = 1) or ((y mod 2) = 1);
   if (x > 1) and (y > 1) then
@@ -834 +854 @@
 
 
+function TOniImage.GetMipMappedImage(var Target: TStream): Boolean;
+var
+  data: TByteData;
+  streampos: Integer;
+begin
+  Result := GetMipMappedImage(data);
+  if not Assigned(Target) then
+    Target := TMemoryStream.Create;
+  streampos := Target.Position;
+  Target.Write(data[0], Length(data));
+  Target.Seek(streampos, soFromBeginning);
+end;
+
+
 end.

oup/rewrite/Global/RawList.pas

@@ -18 +18 @@
       FRawListHandlers: TRawListHandlers;
     public
+      property RawListHandlers: TRawListHandlers read FRawListHandlers;
       procedure InsertRawListHandler(ext: String; needed: Boolean; handler: THandler);
       function GetRawList(ConnectionID, FileID: Integer): TRawDataList;

oup/rewrite/Helper/ValueEdit.pas

@@ -33 +33 @@
 implementation
 
-uses BinEdit, {RawEdit, }DatStructureLoader, Main;
+uses BinEdit, RawEdit, DatStructureLoader, Main;
 
 {$R *.dfm}

oup/rewrite/Main.dfm

@@ -370 +370 @@
       'Compatible level files|*.dat;*.oldb|Oni level (*.dat)|*.dat|OUP ' +
       'level database (*.oldb)|*.oldb|Any (*.*)|*'
-    Options = [ofPathMustExist, ofFileMustExist, ofEnableSizing]
+    Options = [ofAllowMultiSelect, ofPathMustExist, ofFileMustExist, ofEnableSizing]
     Left = 32
     Top = 64

oup/rewrite/Main.pas

@@ -11 +11 @@
   Settings, {Helper_LevelDB, }
   Template,
-  Preview;
-//  BinEdit, Extractor, RawEdit, TxmpReplace;
+  RawEdit, BinEdit, Extractor, Preview, TxmpReplace;
 
 type
@@ -162 +161 @@
   begin
     UpdateStatBar;
+    UpdateConLists;
   end;
 end;
@@ -497 +497 @@
 procedure TForm_Main.LoadFile(typedb: Boolean);
 var
-  ext: String;
+  i: Integer;
 begin
   opend.InitialDir := AppSettings.DatPath;
@@ -507 +507 @@
   if opend.Execute then
   begin
-    ext := ExtractFileExt(opend.FileName);
-    if ext = '.dat' then
-    begin
-      CreateConnection(opend.FileName);
-    end else if ext = '.oldb' then
-    begin
-      CreateConnection(opend.FileName);
-    end else
-      ShowMessage('Incompatible file');
+    if opend.Files.Count > 0 then
+      for i := 0 to opend.Files.Count - 1 do
+        CreateConnection(opend.Files.Strings[i]);
     AppSettings.DatPath := ExtractFilepath(opend.FileName);
   end;
@@ -693 +687 @@
     CheckConnectionCloseable(index);
     ConManager.CloseConnectionByIndex(index, RepMsg);
+    ShowOpenMsg(RepMsg);
+    UpdateConLists;
   end;
   UpdateStatBar;
@@ -751 +747 @@
   if window_context = 'binedit' then
   begin
-//    toolform         := TForm_BinEdit.Create(Self);
+    toolform         := TForm_BinEdit.Create(Self);
     toolform.Caption := 'Binary .dat-Editor ' + caption_end;
     iconindex        := 5;
@@ -757 +753 @@
   if window_context = 'extractor' then
   begin
-//    toolform         := TForm_Extractor.Create(Self);
+    toolform         := TForm_Extractor.Create(Self);
     toolform.Caption := 'Extractor ' + caption_end;
     iconindex        := 8;
@@ -769 +765 @@
   if window_context = 'rawedit' then
   begin
-//    toolform         := TForm_RawEdit.Create(Self);
+    toolform         := TForm_RawEdit.Create(Self);
     toolform.Caption := 'Binary .raw-Editor ' + caption_end;
     iconindex        := 6;
@@ -775 +771 @@
   if window_context = 'txmpreplace' then
   begin
-//    toolform         := TForm_TxmpReplace.Create(Application);
+    toolform         := TForm_TxmpReplace.Create(Self);
     toolform.Caption := 'TXMP Replacer ' + caption_end;
     iconindex        := 7;

oup/rewrite/OniUnPacker.bdsproj

@@ -178 +178 @@
                 </Language>  
     
-    
     <Excluded_Packages>
       <Excluded_Packages Name="d:\programme\borland\bds\3.0\Bin\dbwebxprt.bpl">Borland Web Wizard Package</Excluded_Packages>

oup/rewrite/OniUnPacker.dpr

@@ -23 +23 @@
   ValueEdit in 'Helper\ValueEdit.pas' {Form_ValueEdit},
   BinEdit in 'Tools\BinEdit.pas' {Form_BinEdit},
-  RawEdit in 'Tools\RawEdit.pas' {Form_RawEdit};
+  RawEdit in 'Tools\RawEdit.pas' {Form_RawEdit},
+  Extractor in 'Tools\Extractor.pas' {Form_Extractor},
+  TxmpReplace in 'Tools\TxmpReplace.pas' {Form_TxmpReplace};
 
 {$R *.res}
@@ -34 +36 @@
   Application.CreateForm(TForm_Settings, Form_Settings);
   Application.CreateForm(TForm_ValueEdit, Form_ValueEdit);
-  Application.CreateForm(TForm_RawEdit, Form_RawEdit);
   Application.Run;
 end.

oup/rewrite/Tools/BinEdit.dfm

@@ -3 +3 @@
   KeyPreview = True
   OnCloseQuery = FormCloseQuery
+  OnCreate = FormCreate
   OnKeyUp = FormKeyUp
   ExplicitWidth = 500

oup/rewrite/Tools/BinEdit.pas

@@ -176 +176 @@
   end;
 end;
-
-
-
-
-function IntToBin(Value: Byte): String;
-var
-  i: Byte;
-begin
-  Result := '';
-  for i := 7 downto 0 do
-    Result := Result + IntToStr((Value shr i) and $01);
-end;
-
 
 

oup/rewrite/Tools/Extractor.dfm

@@ -22 +22 @@
       Width = 333
       Height = 338
+      MultiSelect = True
       ExplicitWidth = 333
       ExplicitHeight = 338

oup/rewrite/Tools/Extractor.pas

@@ -36 +36 @@
 implementation
 {$R *.dfm}
-uses Main, Functions, Data, OniDataClass, FolderBrowser, Exporters;
+uses Main, Functions, Data, ConnectionManager, FolderBrowser, Exporters;
 
 
@@ -105 +105 @@
     if (selonly and filelist.Selected[i]) or not selonly then
     begin
-      fileid := Connection.ExtractFileID(filelist.Items.Strings[i]);
+      fileid := ConManager.Connection[ConnectionID].ExtractFileIDOfName(filelist.Items.Strings[i]);
       filename := GetWinFilename(filelist.Items.Strings[i]);
       if check_dat.Checked then
-        ExportDatFile(Connection, fileid, path + filename);
+        ExportDatFile(ConnectionID, fileid, path + filename);
       if check_raw.Checked then
-        ExportRawFiles(Connection, fileid, path + filename);
+        ExportRawFiles(ConnectionID, fileid, path + filename);
       if check_convert.Checked then
-        ExportConverted(Connection, fileid, path + filename);
+        ExportConverted(ConnectionID, fileid, path + filename);
       Inc(done);
     end;

oup/rewrite/Tools/RawEdit.dfm

@@ -3 +3 @@
   KeyPreview = True
   OnCloseQuery = FormCloseQuery
+  OnCreate = FormCreate
   OnKeyUp = FormKeyUp
   ExplicitWidth = 500

oup/rewrite/Tools/RawEdit.pas

@@ -63 +63 @@
 implementation
 {$R *.dfm}
-uses Main, ValueEdit;
+uses Main, ValueEdit, RawList;
 
 procedure TForm_RawEdit.NewFile(fileinfo: TFileInfo);
@@ -115 +115 @@
     for i := 0 to filelist.Count - 1 do
     begin
-      if ConManager.Connection[ConID].ExtractFileIDOfName(filelist.Items.Strings[i]) = RawInfo.SrcID then
+      if ConManager.Connection[ConID].ExtractFileIDOfName(filelist.Items.Strings[i]) = Raw_Info.SrcID then
       begin
         filelist.ItemIndex := i;
@@ -132 +132 @@
   end;
   mem := nil;
-  ConManager.Connection[ConID].LoadRawFile(raw_info.SrcID, raw_info.SrcOffset, mem);
+  ConManager.Connection[ConID].LoadRawFile(raw_info.SrcID, raw_info.SrcOffset, TStream(mem));
   hex.LoadFromStream(mem);
   ClearValues;
@@ -146 +146 @@
 begin
   ClearValues;
-  dat_offset := StrToInt('$' + MidStr(
+  datoffset := StrToInt('$' + MidStr(
     list_offset.Items.Strings[list_offset.ItemIndex], 3, 8));
-  LoadRaw(Connection.GetRawInfo(fileid, dat_offset));
-end;
-
-
-
-
-function IntToBin(Value: Byte): String;
-var
-  i: Byte;
-begin
-  Result := '';
-  for i := 7 downto 0 do
-  begin
-    Result := Result + IntToStr((Value shr i) and $01);
-  end;
+  LoadRaw(ConManager.Connection[ConID].GetRawInfo(fileid, datoffset));
 end;
 
@@ -170 +156 @@
 function TForm_RawEdit.GetValue(datatype: Word; offset: LongWord): String;
 var
-  Data: Tdata;
+  Data: TByteData;
   i:    Word;
   floatformat: TFormatSettings;
@@ -231 +217 @@
 begin
   for i := 1 to value_viewer.RowCount - 1 do
-  begin
     value_viewer.Cells[1, i] := '';
-  end;
 end;
 
@@ -242 +226 @@
 var
   i, j:  Integer;
-  Data:  Tdata;
+  Data:  TByteData;
   str:   String;
   Value: LongWord;
@@ -363 +347 @@
 
   exts := '';
-  if Length(RawListHandlers) > 0 then
-  begin
-    for i := 0 to High(RawListHandlers) do
+  if Length(RawLists.RawListHandlers) > 0 then
+  begin
+    for i := 0 to High(RawLists.RawListHandlers) do
       if Length(exts) > 0 then
-        exts := exts + ',' + RawListHandlers[i].Ext
+        exts := exts + ',' + RawLists.RawListHandlers[i].Ext
       else
-        exts := RawListHandlers[i].Ext;
+        exts := RawLists.RawListHandlers[i].Ext;
   end;
   Self.AllowedExts := exts;
@@ -404 +388 @@
 var
   mem:  TMemoryStream;
-  Data: Tdata;
   i:    LongWord;
 begin
   case MessageBox(Self.Handle, PChar('Save changes to .raw-part of file ' +
-      Connection.GetFileInfo(fileid).FileName + '?'), PChar('Data changed...'),
+      ConManager.Connection[ConID].GetFileInfo(fileid).Name + '?'), PChar('Data changed...'),
       MB_YESNOCANCEL) of
     idYes:
@@ -415 +398 @@
       hex.SaveToStream(mem);
       mem.Seek(0, soFromBeginning);
-      SetLength(Data, mem.Size);
-      mem.Read(Data[0], mem.Size);
+      ConManager.Connection[ConID].UpdateRawFile(fileid, datoffset, mem);
       mem.Free;
-      Connection.UpdateRawFile(fileid_opened, dat_offset_opened,
-        Length(Data), @Data[0]);
       hex.Modified := False;
       for i := 0 to hex.Datasize - 1 do
@@ -428 +408 @@
       Result := True;
     idCancel:
-    begin
       Result := False;
-    end;
   end;
 end;
@@ -440 +418 @@
 begin
   if hex.Modified then
-  begin
     if not Save then
       CanClose := False;
-  end;
 end;
 
@@ -529 +505 @@
   fs: TFileStream;
 begin
-  saved.Filter     := 'Files of matching extension (*.' + Connection.GetFileInfo(
-    fileid).Extension + ')|*.' + Connection.GetFileInfo(fileid).Extension +
+  saved.Filter     := 'Files of matching extension (*.' +
+    ConManager.Connection[ConID].GetFileInfo(fileid).Extension + ')|*.' +
+    ConManager.Connection[ConID].GetFileInfo(fileid).Extension +
     '|All files|*.*';
-  saved.DefaultExt := Connection.GetFileInfo(fileid).Extension;
+  saved.DefaultExt := ConManager.Connection[ConID].GetFileInfo(fileid).Extension;
   if saved.Execute then
   begin
@@ -548 +525 @@
 //  Data: Tdata;
   fs:   TFileStream;
-begin
-  opend.Filter := 'Files of matching extension (*.' + Connection.GetFileInfo(
-    fileid).Extension + ')|*.' + Connection.GetFileInfo(fileid).Extension +
+  data: TByteData;
+  i: Integer;
+  rawinfo: TRawDataInfo;
+begin
+  opend.Filter := 'Files of matching extension (*.' +
+    ConManager.Connection[ConID].GetFileInfo(fileid).Extension + ')|*.' +
+    ConManager.Connection[ConID].GetFileInfo(fileid).Extension +
     '|All files|*.*';
   if opend.Execute then
@@ -557 +538 @@
     if fs.Size <> hex.DataSize then
     begin
-      ShowMessage('Can''t import ' + ExtractFilename(opend.FileName) +
-        ', file has to have same size as file in .dat.' + CrLf +
-        'Size of file in .dat: ' + FormatFileSize(hex.datasize) + CrLf +
-        'Size of chosen file: ' + FormatFileSize(fs.Size));
-    end
-    else
-    begin
-      hex.LoadFromStream(fs);
-      hex.Modified := True;
-    end;
+      if (not (CR_ResizeRaw in ConManager.Connection[ConID].ChangeRights)) and (not (CR_AppendRaw in ConManager.Connection[ConnectionID].ChangeRights)) then
+      begin
+        ShowMessage('Can''t import ' + ExtractFilename(importd.FileName) +
+            ', file has to have same size as file in .raw with this backend.' + CrLf +
+            'Size of file in .raw: ' + FormatFileSize(hex.DataSize) + CrLf +
+            'Size of chosen file: ' + FormatFileSize(fs.Size));
+        Exit;
+      end else begin
+        if MessageBox(Self.Handle,
+              PChar('File has different size from the file in the .raw.' + CrLf +
+                    'Size of file in .dat: ' + FormatFileSize(hex.DataSize) + CrLf +
+                    'Size of chosen file: ' + FormatFileSize(fs.Size) + CrLf +
+                    'Replace anyway?' + CrLf +
+                    'WARNING: This only replaces the raw-data. It doesn''t' + CrLf +
+                    'do the according changes in the .dat. Oni probably' + CrLf +
+                    'won''t be able to use the data correctly!'), PChar('Different size'), MB_YESNO + MB_ICONWARNING) = ID_NO then
+        begin
+          Exit;
+        end;
+      end;
+      rawinfo := ConManager.Connection[ConID].GetRawInfo(fileid, datoffset);
+      if CR_ResizeRaw in ConManager.Connection[ConID].ChangeRights then
+        ConManager.Connection[ConID].UpdateRawFile(fileid, datoffset, fs)
+      else if CR_AppendRaw in ConManager.Connection[ConID].ChangeRights then
+        i := ConManager.Connection[ConID].AppendRawFile(rawinfo.LocSep, fs);
+        ConManager.Connection[ConID].UpdateDatFilePart(fileid, datoffset, 4, @i);
+    end else begin
+      ConManager.Connection[ConID].UpdateRawFile(fileid, datoffset, fs);
+    end;
+    fs.Seek(0, soFromBeginning);
+    hex.LoadFromStream(fs);
+    hex.Modified := False;
+    for i := 0 to hex.Datasize - 1 do
+      hex.ByteChanged[i] := False;
     fs.Free;
   end;
@@ -691 +696 @@
 procedure TForm_RawEdit.SetNewValue(datatype: Word; offset: LongWord; Value: String);
 var
-  Data: Tdata;
+  Data: TByteData;
   value_int: LongWord;
   value_float: Single;

oup/rewrite/Tools/Template.dfm

@@ -242 +242 @@
         Style = csDropDownList
         Anchors = [akLeft, akTop, akRight]
-        DropDownCount = 12
+        DropDownCount = 20
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -288 +288 @@
         Style = csDropDownList
         Anchors = [akLeft, akTop, akRight]
+        DropDownCount = 12
         ItemHeight = 13
         TabOrder = 4

oup/rewrite/Tools/Template.pas

@@ -117 +117 @@
       else
         datatype := 'Unknown: ';
-      boxstring := datatype + fn + ' (Level: ' + IntToStr(level) + ')';
+      boxstring := datatype + fn + ' (Level: ' + IntToStr(level) + ') [' + IntToStr(ConManager.ConnectionByIndex[i].ConnectionID) + ']';
       combo_connection.Items.Add(boxstring);
       if ConManager.ConnectionByIndex[i].ConnectionID = FConnectionID then
@@ -276 +276 @@
 begin
   if combo_connection.ItemIndex >= 0 then
-    FConnectionID := combo_connection.ItemIndex
+  begin
+    name := combo_connection.Items.Strings[combo_connection.ItemIndex];
+    FConnectionID := StrToInt(MidStr(name, Pos('[', name) + 1, Pos(']', name) - Pos('[', name)  - 1));
+  end
   else
     FConnectionID := -1;

oup/rewrite/Tools/TxmpReplace.dfm

@@ -1 +1 @@
 inherited Form_TxmpReplace: TForm_TxmpReplace
   Caption = 'TxmpReplace'
+  OnCreate = FormCreate
   PixelsPerInch = 96
   TextHeight = 13

oup/rewrite/Tools/TxmpReplace.pas

@@ -47 +47 @@
 procedure TForm_TxmpReplace.SelectFile(fileinfo: TFileInfo);
 var
-  Data: TByteData;
   mem:  TMemoryStream;
   fadingbyte, depthbyte, storebyte: Byte;
 begin
   fileid := fileinfo.ID;
-  Connection.LoadDatFilePart(fileid, $88, SizeOf(fadingbyte), @fadingbyte);
-  Connection.LoadDatFilePart(fileid, $89, SizeOf(depthbyte), @depthbyte);
-  Connection.LoadDatFilePart(fileid, $90, SizeOf(storebyte), @storebyte);
+  ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $88, SizeOf(fadingbyte), @fadingbyte);
+  ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $89, SizeOf(depthbyte), @depthbyte);
+  ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $90, SizeOf(storebyte), @storebyte);
   check_fading.Checked := (fadingbyte and $01) > 0;
   check_transparency.Checked := (depthbyte and $04) > 0;
 
-  OniImage_Old.LoadFromTXMP(connection, fileid);
+  OniImage_Old.LoadFromTXMP(ConnectionID, fileid);
   old_size := OniImage_Old.GetImageDataSize((fadingbyte and $01) > 0);
-  Data := OniImage_Old.GetAsBMP;
   mem  := TMemoryStream.Create;
-  mem.Write(Data[0], Length(Data));
+  OniImage_Old.GetAsBMP(TStream(mem));
   mem.Seek(0, soFromBeginning);
   image_txmppreview.Picture.Bitmap.LoadFromStream(mem);
@@ -74 +72 @@
 var
   mem:   TMemoryStream;
-  tempd: Tdata;
 begin
   if opend.Execute then
   begin
     OniImage_New.LoadFromBMP(opend.FileName);
-    tempd := OniImage_New.GetAsBMP;
     mem   := TMemoryStream.Create;
-    mem.Write(tempd[0], Length(tempd));
+    OniImage_New.GetAsBMP(TStream(mem));
     mem.Seek(0, soFromBeginning);
     image_bmppreview.Picture.Bitmap.LoadFromStream(mem);
@@ -97 +93 @@
   old_rawaddr, new_rawaddr: LongWord;
   oldfading: Byte;
-  tempd:     Tdata;
-
   datbyte: Word;
+  mem: TMemoryStream;
 begin
   if filelist.ItemIndex >= 0 then
   begin
-    Connection.LoadDatFilePart(fileid, $88, 1, @oldfading);
-    if Connection.OSisMac then
-      Connection.UpdateDatFilePart(fileid, $A0, 4, @old_rawaddr)
+    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $88, 1, @oldfading);
+    if not (ConManager.Connection[ConnectionID].DataOS = DOS_WIN) then
+      ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $A0, 4, @old_rawaddr)
     else
-      Connection.LoadDatFilePart(fileid, $9C, 4, @old_rawaddr);
+      ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $9C, 4, @old_rawaddr);
 
     if (OniImage_Old.Width <> OniImage_New.Width) or
       (OniImage_Old.Height <> OniImage_New.Height) then
     begin
-      if MessageBox(Self.Handle, PChar(
-        'Current image and new image have different size' + CrLf +
-        '(Current: ' + IntToStr(OniImage_Old.Width) +
-        'x' + IntToStr(OniImage_Old.Height) + ' - New: ' +
-        IntToStr(OniImage_New.Width) + 'x' + IntToStr(OniImage_New.Height) + ')' + CrLf +
-        'Replace anyways?'),
-        PChar(filelist.Items.Strings[filelist.ItemIndex]),
-        MB_YESNO) = idNo then
+      if MessageBox(Self.Handle,
+            PChar(
+              'Current image and new image have different size' + CrLf +
+              '(Current: ' + IntToStr(OniImage_Old.Width) + 'x' +
+              IntToStr(OniImage_Old.Height) + ' - New: ' +
+              IntToStr(OniImage_New.Width) + 'x' + IntToStr(OniImage_New.Height) +
+              ')' + CrLf + 'Replace anyway?'),
+            PChar(filelist.Items.Strings[filelist.ItemIndex]), MB_YESNO) = idNo then
         Exit;
     end;
 
+    mem := TMemoryStream.Create;
+
     if check_fading.Checked then
-      if not OniImage_New.GetMipMappedImage(tempd) then
+      if not OniImage_New.GetMipMappedImage(TStream(mem)) then
         if MessageBox(Self.Handle,
-          PChar('Can not create a MipMapped-image (probably because of a wrong dimension).' +
-          #13 + #10 + 'Do you want to continue without MipMapping?'), PChar('Warning'),
-          MB_YESNO) = ID_YES then
+              PChar('Can not create a MipMapped-image (probably because of a wrong dimension).' +
+                #13 + #10 + 'Do you want to continue without MipMapping?'), PChar('Warning'),
+                MB_YESNO) = ID_YES then
           check_fading.Checked := False
         else
@@ -134 +131 @@
 
     if not check_fading.Checked then
-      tempd := OniImage_New.GetAsData;
+    begin
+      mem.Clear;
+      OniImage_New.GetAsData(TStream(mem));
+    end;
 
     newsize := OniImage_New.GetImageDataSize(check_fading.Checked);
 
-    if (newsize > old_size) and (Connection.Backend = ODB_Dat) then
-      new_rawaddr := Connection.AppendRawFile(
-        Connection.OSisMac, Length(tempd), tempd)
+    if (newsize > old_size) and (ConManager.Connection[ConnectionID].Backend = DB_ONI) then
+      new_rawaddr := ConManager.Connection[ConnectionID].AppendRawFile(
+        not (ConManager.Connection[ConnectionID].DataOS = DOS_WIN), mem.Size, mem)
     else
     begin
       new_rawaddr := old_rawaddr;
-      Connection.UpdateRawFile(fileid, $9C, Length(tempd), tempd);
+      ConManager.Connection[ConnectionID].UpdateRawFile(fileid, $9C, mem);
     end;
 
@@ -150 +150 @@
     if check_fading.Checked then
       datbyte := datbyte or $01;
-    Connection.UpdateDatFilePart(fileid, $88, 1, @datbyte);
+    ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $88, 1, @datbyte);
     datbyte := $10;
     if check_transparency.Checked then
       datbyte := datbyte or $04;
-    Connection.UpdateDatFilePart(fileid, $89, 1, @datbyte);
-    Connection.UpdateDatFilePart(fileid, $8C, 2, @OniImage_New.Width);
-    Connection.UpdateDatFilePart(fileid, $8E, 2, @OniImage_New.Height);
+    ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $89, 1, @datbyte);
+    ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $8C, 2, @OniImage_New.Width);
+    ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $8E, 2, @OniImage_New.Height);
     datbyte := $08;
-    Connection.UpdateDatFilePart(fileid, $90, 1, @datbyte);
-    if Connection.OSisMac then
-      Connection.UpdateDatFilePart(fileid, $A0, 4, @new_rawaddr)
+    ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $90, 1, @datbyte);
+    if not (ConManager.Connection[ConnectionID].DataOS = DOS_WIN) then
+      ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $A0, 4, @new_rawaddr)
     else
-      Connection.UpdateDatFilePart(fileid, $9C, 4, @new_rawaddr);
+      ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $9C, 4, @new_rawaddr);
 
     ShowMessage('TXMP-image replaced');