ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/oup/current/DataAccess/Access_OniArchive.pas

Comparing:
oup/rewrite/DataAccess/Access_OniArchive.pas (file contents), Revision 93 by alloc, Thu Jan 18 17:15:59 2007 UTC vs.
oup/current/DataAccess/Access_OniArchive.pas (file contents), Revision 209 by alloc, Mon Jun 4 22:07:29 2007 UTC

#	Line 1 | Line 1
1		unit Access_OniArchive;
2		interface
3
4	<	uses DataAccess, Classes;
4	>	uses DataAccess, Classes, TypeDefs;
5
6		type
7	–	{
8	–	THeader = packed record
9	–	Ident:      array[0..$13] of Byte;
10	–	Files:      LongWord;
11	–	NamedFiles: LongWord;
12	–	Extensions: LongWord;
13	–	DataAddr:   LongWord;
14	–	DataSize:   LongWord;
15	–	NamesAddr:  LongWord;
16	–	NamesSize:  LongWord;
17	–	Ident2:     array[0..$F] of Byte;
18	–	end;
19	–	TFilesMap = array of packed record
20	–	Extension: array[0..$3] of Char;
21	–	DataAddr:  LongWord;
22	–	NameAddr:  LongWord;
23	–	FileSize:  LongWord;
24	–	FileType:  LongWord;
25	–	end;
26	–
27	–	TFileInfo = packed record
28	–	ID:      Integer;
29	–	FileName: String;
30	–	FileNameHex: String;
31	–	Extension: String[4];
32	–	Name:    String;
33	–	Size:    LongWord;
34	–	FileType: LongWord;
35	–	DatAddr: LongWord;
36	–	opened:  Boolean;
37	–	end;
38	–	TFiles = array of TFileInfo;
39	–
40	–	TNamedFilesMap = array of packed record
41	–	FileNumber: LongWord;
42	–	blubb:      LongWord;
43	–	end;
44	–	TExtensionsMap = array of packed record
45	–	Ident:     array[0..$7] of Byte;
46	–	Extension: array[0..$3] of Char;
47	–	ExtCount:  LongWord;
48	–	end;
49	–	}
50	–
7		TAccess_OniArchive = class(TDataAccess)
8		private
9	<	{    Fdat_file:     TFileStream;
10	<	Fraw_file:     TFileStream;
11	<	Fsep_file:     TFileStream;
12	<	Fdat_header:   THeader;
13	<	Fdat_filesmap: TFilesMap;
14	<	Fdat_files:    TFiles;
15	<	Fdat_namedfilesmap: TNamedFilesMap;
16	<	Fdat_extensionsmap: TExtensionsMap;
17	<	FUnloadWhenUnused: Boolean;
18	<	FDatOpened:    Boolean;
63	<	FRawOpened:    Boolean;
64	<	FSepOpened:    Boolean;
9	>	Fdat_file:           TFileStream;
10	>	Fraw_file:           TFileStream;
11	>	Fsep_file:           TFileStream;
12	>	Fdat_files:          TFiles;
13	>	Fdat_extensionsmap:  TExtensionsMap;
14	>	FUnloadWhenUnused:   Boolean;
15	>	FDatOpened:          Boolean;
16	>	FRawOpened:          Boolean;
17	>	FSepOpened:          Boolean;
18	>	procedure SetUnloadWhenUnused(doit: Boolean);
19		protected
20		public
21	<	property UnloadWhenUnused: Boolean Read FUnloadWhenUnused Write FUnloadWhenUnused;
21	>	property UnloadWhenUnused: Boolean Read FUnloadWhenUnused Write SetUnloadWhenUnused;
22
23	<	constructor Create(DatFilename: String; var Result: Boolean); override;
23	>	constructor Create(DatFilename: String; ConnectionID: Integer; var Msg: TStatusMessages); override;
24		procedure Close; override;
25
26	<	function GetFileInfo(fileid: Integer): TFileInfo; override;
27	<	function GetFilesList(ext: String; pattern: String;
28	<	NoEmptyFiles: Boolean; sort: TSortType): TStringArray; override;
29	<	function GetFilesCount: LongWord; override;
30	<	function GetExtensionsList: TStringArray; override;
31	<	function GetExtendedExtensionsList: TExtensionsMap; override;
32	<
33	<	function LoadDatFile(fileid: LongWord): Tdata; override;
34	<	procedure UpdateDatFile(fileid: LongWord; Data: Tdata); override;
35	<	procedure LoadDatFilePart(fileid, offset, size: LongWord; target: Pointer); override;
36	<	procedure UpdateDatFilePart(fileid, offset, size: LongWord; target: Pointer); override;
37	<
38	<	procedure LoadRawOffset(loc_sep: Boolean; raw_addr, size: LongWord; target: Pointer);
39	<	function GetRawList(fileid: LongWord): TRawList; override;
40	<	procedure LoadRawFile(fileid, dat_offset: LongWord; target: Pointer); override;
41	<	procedure UpdateRawFile(fileid, dat_offset: LongWord; size: LongWord;
42	<	target: Pointer); override;
43	<	procedure LoadRawFilePart(fileid, dat_offset: LongWord;
44	<	offset, size: LongWord; target: Pointer); override;
45	<	procedure UpdateRawFilePart(fileid, dat_offset: LongWord;
46	<	offset, size: LongWord; target: Pointer); override;
47	<	function AppendRawFile(loc_sep: Boolean; size: LongWord; target: Pointer): LongWord;
48	<	override;//Returns new Address
26	>	function GetFileInfo(FileID: Integer): TFileInfo; override;
27	>	function GetFilesList(Ext: String; Pattern: String;
28	>	NoEmptyFiles: Boolean; SortType: TSortType): TStrings; override;
29	>	function GetFileCount: Integer; override;
30	>	function GetExtensionsList(ExtListFormat: TExtensionFormat): TStrings; override;
31	>
32	>	procedure LoadDatFile(FileID: Integer; var Target: TStream); overload; override;
33	>	procedure UpdateDatFile(FileID: Integer; Src: TStream); overload; override;
34	>	procedure LoadDatFilePart(FileID, Offset, Size: Integer; var Target: TStream); overload; override;
35	>	procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TStream); overload; override;
36	>
37	>	function GetDatLinks(FileID: Integer): TDatLinkList; override;
38	>	function GetDatLink(FileID, DatOffset: Integer): TDatLink; override;
39	>	function GetRawList(FileID: Integer): TRawDataList; override;
40	>	function GetRawInfo(FileID, DatOffset: Integer): TRawDataInfo; override;
41	>
42	>	procedure LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; var target: TStream); overload;
43	>	procedure LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; target: Pointer); overload;
44	>	procedure LoadRawFile(FileID, DatOffset: Integer; var Target: TStream); overload; override;
45	>	procedure UpdateRawFile(FileID, DatOffset: Integer; Src: TStream); overload; override;
46	>	procedure LoadRawFilePart(FileID, DatOffset, Offset, Size: Integer; var Target: TStream); overload; override;
47	>	procedure UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TStream); overload; override;
48	>
49	>	function AppendRawFile(LocSep: Boolean; Src: TStream): Integer; overload; override;
50		published
51	<	}  end;
51	>	end;
52
53		implementation
54
55	+	uses
56	+	SysUtils, StrUtils, Data, Functions, RawList, DatLinks, Math;
57	+
58
59		(*
60		================================================================================
61		Implementation of  TOniDataDat
62		*)
63
64	<	{
65	<	constructor TOniDataDat.Create(DatFilename: String; var Result: Boolean);
108	<	const
109	<	header_ident1_pc: array[0..$13] of Byte =
110	<	($1F, $27, $DC, $33, $DF, $BC, $03, $00, $31, $33, $52, $56, $40, $00,
111	<	$14, $00, $10, $00, $08, $00);
112	<	header_ident1_mac: array[0..$13] of Byte =
113	<	($61, $30, $C1, $23, $DF, $BC, $03, $00, $31, $33, $52, $56, $40, $00,
114	<	$14, $00, $10, $00, $08, $00);
115	<	header_ident1_macbeta: array[0..$13] of Byte =
116	<	($81, $11, $8D, $23, $DF, $BC, $03, $00, $31, $33, $52, $56, $40, $00,
117	<	$14, $00, $10, $00, $08, $00);
118	<	header_ident2: array[0..$F] of Byte =
119	<	($99, $CF, $40, $00, $90, $4F, $63, $00, $F4, $55, $5F, $00, $90, $4F, $63, $00);
64	>
65	>	constructor TAccess_OniArchive.Create(DatFilename: String; ConnectionID: Integer; var Msg: TStatusMessages);
66		var
67	<	i: LongWord;
68	<	header_pc, header_mac: Boolean;
67	>	i: Integer;
68	>	header_pc, header_mac, header_macbeta: Boolean;
69	>	Fdat_header:   THeader;
70	>	Fdat_filesmap: TFilesMap;
71	>	Fdat_namedfilesmap: TNamedFilesMap;
72		begin
73		FUnloadWhenUnused := True;
74		FDatOpened := False;
75		FRawOpened := False;
76	+	Msg := SM_UnknownError;
77		if not FileExists(DatFilename) then
78		begin
79	<	ShowMessage('File doesn''t exist!!!');
130	<	Result := False;
79	>	Msg := SM_FileNotFound;
80		Exit;
81		end;
82		FFileName := DatFilename;
#	Line 135 | Line 84 | begin
84		Fdat_file.Read(Fdat_header, SizeOf(Fdat_header));
85		header_pc  := True;
86		header_mac := True;
87	<	for i := 0 to High(Fdat_header.Ident) do
87	>	header_macbeta := True;
88	>	for i := 0 to High(Fdat_header.GlobalIdent) do
89	>	if Fdat_header.GlobalIdent[i] <> HeaderGlobalIdent[i] then
90	>	begin
91	>	Msg := SM_IncompatibleFile;
92	>	Exit;
93	>	end;
94	>
95	>	for i := 0 to High(Fdat_header.OSIdent) do
96		begin
97	<	FLevelInfo.Ident[i] := Fdat_header.Ident[i];
141	<	if Fdat_header.Ident[i] <> header_ident1_pc[i] then
97	>	if Fdat_header.OSIdent[i] <> HeaderOSIdentWin[i] then
98		header_pc := False;
99	<	if Fdat_header.Ident[i] <> header_ident1_mac[i] then
99	>	if Fdat_header.OSIdent[i] <> HeaderOSIdentMac[i] then
100		header_mac := False;
101	+	if Fdat_header.OSIdent[i] <> HeaderOSIdentMacBeta[i] then
102	+	header_macbeta := False;
103		end;
104	<	if not (header_pc xor header_mac) then
104	>	if not (header_pc xor header_mac xor header_macbeta) then
105		begin
106	<	Result := False;
106	>	Msg := SM_IncompatibleFile;
107		Exit;
108		end
109		else
110		begin
111	<	if (header_pc and not header_mac) then
112	<	Fos_mac := False
113	<	else
114	<	Fos_mac := True;
111	>	if (header_pc and not header_mac and not header_macbeta) then
112	>	FDataOS := DOS_WIN
113	>	else if (not header_pc and header_mac and not header_macbeta) then
114	>	FDataOS := DOS_MAC
115	>	else if (not header_pc and not header_mac and header_macbeta) then
116	>	FDataOS := DOS_MACBETA;
117		end;
118		SetLength(Fdat_filesmap, Fdat_header.Files);
119		SetLength(Fdat_files, Fdat_header.Files);
#	Line 179 | Line 139 | begin
139		begin
140		Fdat_files[i].Name := '';
141		end;
182	–	Fdat_files[i].FileName    :=
183	–	FormatNumber(i, 5, '0') + '-' + Fdat_files[i].Name + '.' + Fdat_files[i].Extension;
184	–	Fdat_files[i].FileNameHex :=
185	–	IntToHex(i, 4) + '-' + Fdat_files[i].Name + '.' + Fdat_files[i].Extension;
142		end;
143		Fdat_file.Seek($40 + Fdat_header.Files * $14, soFromBeginning);
144		SetLength(Fdat_namedfilesmap, Fdat_header.NamedFiles);
#	Line 195 | Line 151 | begin
151		Fdat_file.Read(Fdat_extensionsmap[i], SizeOf(Fdat_extensionsmap[i]));
152
153		Fdat_file.Seek(Fdat_files[0].DatAddr + 7, soFromBeginning);
154	<	Fdat_file.Read(FLevelInfo.LevelNumber, 1);
155	<	FLevelInfo.LevelNumber := FLevelInfo.LevelNumber div 2;
154	>	Fdat_file.Read(FLevelNumber, 1);
155	>	FLevelNumber := FLevelNumber div 2;
156
157		Fdat_file.Free;
158
159	<	Result   := True;
160	<	FBackend := ODB_Dat;
159	>	Msg := SM_OK;
160	>	FBackend := DB_ONI;
161	>	FConnectionID := ConnectionID;
162	>	FChangeRights := [CR_EditDat, CR_EditRaw, CR_AppendRaw];
163		end;
164
165
166
167
168	<	procedure TOniDataDat.Close;
168	>	procedure TAccess_OniArchive.SetUnloadWhenUnused(doit: Boolean);
169		begin
170	<	if not FUnloadWhenUnused and FDatOpened then
170	>	FUnloadWhenUnused := doit;
171	>	if FUnloadWhenUnused then
172	>	begin
173	>	if FDatOpened then
174	>	begin
175	>	FDatOpened := False;
176	>	Fdat_file.Free;
177	>	end;
178	>	if FRawOpened then
179	>	begin
180	>	FRawOpened := False;
181	>	Fraw_file.Free;
182	>	end;
183	>	if FSepOpened then
184	>	begin
185	>	FSepOpened := False;
186	>	Fsep_file.Free;
187	>	end;
188	>	end
189	>	else
190	>	begin
191	>	if not FDatOpened then
192	>	begin
193	>	Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
194	>	FDatOpened := True;
195	>	end;
196	>	if not FRawOpened then
197	>	begin
198	>	Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
199	>	fmOpenReadWrite);
200	>	FRawOpened := True;
201	>	end;
202	>	if (not FSepOpened) and (FDataOS <> DOS_WIN) then
203	>	begin
204	>	Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
205	>	fmOpenReadWrite);
206	>	FSepOpened := True;
207	>	end;
208	>	end;
209	>	end;
210	>
211	>
212	>
213	>
214	>
215	>	procedure TAccess_OniArchive.Close;
216	>	begin
217	>	if FDatOpened then
218		Fdat_file.Free;
219	<	if not FUnloadWhenUnused and FRawOpened then
219	>	if FRawOpened then
220		Fraw_file.Free;
221	<	if not FUnloadWhenUnused and FSepOpened then
221	>	if FSepOpened then
222		Fsep_file.Free;
223		Self.Free;
224		end;
#	Line 221 | Line 226 | end;
226
227
228
229	<	function TOniDataDat.GetFileInfo(fileid: Integer): TFileInfo;
229	>	function TAccess_OniArchive.GetFileInfo(fileid: Integer): TFileInfo;
230		begin
231		if fileid = -1 then
232		begin
233		Result := inherited GetFileInfo(fileid);
234		Exit;
235		end;
236	<	if fileid < Self.GetFilesCount then
236	>	if fileid < Self.GetFileCount then
237		Result    := Fdat_files[fileid]
238		else
239		Result.ID := -1;
#	Line 237 | Line 242 | end;
242
243
244
245	<	function TOniDataDat.GetFilesList(ext: String; pattern: String;
246	<	NoEmptyFiles: Boolean; sort: TSortType): TStringArray;
245	>	function TAccess_OniArchive.GetFilesList(ext: String; pattern: String;
246	>	NoEmptyFiles: Boolean; SortType: TSortType): TStrings;
247		var
248	<	i: LongWord;
249	<	list: TStringList;
248	>	i:      Integer;
249	>	list:   TStringList;
250		id, name, extension: String;
251		fields: TStrings;
252
253		procedure getfields;
254		begin
255	<	fields.CommaText := StringReplace(AnsiQuotedStr(list.Strings[i], '"'), ';', '","', [rfReplaceAll]);
256	<	if sort in [stIDAsc, stIDDesc] then
255	>	fields.CommaText := StringReplace(AnsiQuotedStr(list.Strings[i], '"'), ';', '","', [rfReplaceAll]);
256	>	if SortType in [ST_IDAsc, ST_IDDesc] then
257		begin
258		id := fields.Strings[0];
259		name := fields.Strings[1];
260		extension := fields.Strings[2];
261		end;
262	<	if sort in [stNameAsc, stNameDesc] then
262	>	if SortType in [ST_NameAsc, ST_NameDesc] then
263		begin
264		id := fields.Strings[1];
265		name := fields.Strings[0];
266		extension := fields.Strings[2];
267		end;
268	<	if sort in [stExtAsc, stExtDesc] then
268	>	if SortType in [ST_ExtAsc, ST_ExtDesc] then
269		begin
270		id := fields.Strings[1];
271		name := fields.Strings[2];
272		extension := fields.Strings[0];
273		end;
274	+	if SortType in [ST_ExtNameAsc, ST_ExtNameDesc] then
275	+	begin
276	+	id := fields.Strings[2];
277	+	name := fields.Strings[1];
278	+	extension := fields.Strings[0];
279	+	end;
280		end;
281
282		begin
283		list := TStringList.Create;
284		list.Sorted := True;
285	<	for i := 0 to Fdat_header.Files - 1 do
285	>	for i := 0 to GetFileCount - 1 do
286		begin
287		if ((Length(ext) = 0) or (Pos(Fdat_files[i].Extension, ext) > 0)) and
288		((Length(pattern) = 0) or
#	Line 279 | Line 290 | begin
290		begin
291		if (NoEmptyFiles = False) or ((Fdat_files[i].FileType and $02) = 0) then
292		begin
293	<	if AppSettings.FilenumbersAsHex then
283	<	id := IntToHex(Fdat_files[i].ID, 4)
284	<	else
285	<	id := FormatNumber(Fdat_files[i].ID, 5, '0');
293	>	id := FormatNumber(Fdat_files[i].ID, 5, '0');
294		name := Fdat_files[i].Name;
295		extension := Fdat_files[i].Extension;
296
297	<	case sort of
298	<	stIDAsc, stIDDesc:     list.Add(id + ';' + name + ';' + extension);
299	<	stNameAsc, stNameDesc: list.Add(name + ';' + id + ';' + extension);
300	<	stExtAsc, stExtDesc:   list.Add(extension + ';' + id + ';' + name);
297	>	case SortType of
298	>	ST_IDAsc, ST_IDDesc:     list.Add(id + ';' + name + ';' + extension);
299	>	ST_NameAsc, ST_NameDesc: list.Add(name + ';' + id + ';' + extension);
300	>	ST_ExtAsc, ST_ExtDesc:   list.Add(extension + ';' + id + ';' + name);
301	>	ST_ExtNameAsc, ST_ExtNameDesc: list.Add(name + ';' + extension + ';' + id);
302		end;
303		end;
304		end;
305		end;
306	<	SetLength(Result, list.Count);
307	<	if Length(Result) > 0 then
306	>	if not Assigned(Result) then
307	>	Result := TStringList.Create;
308	>	if list.Count > 0 then
309		begin
310		fields := TStringList.Create;
311	<	if sort in [stIDAsc, stNameAsc, stExtAsc] then
311	>	if SortType in [ST_IDAsc, ST_NameAsc, ST_ExtAsc, ST_ExtNameAsc] then
312		for i := 0 to list.Count - 1 do
313		begin
314		getfields;
315	<	Result[i] := id + '-' + name + '.' + extension;
315	>	Result.Add(id + '-' + name + '.' + extension);
316		end
317		else
318		for i := list.Count - 1 downto 0 do
319		begin
320		getfields;
321	<	Result[list.Count - i - 1] := id + '-' + name + '.' + extension;
321	>	Result.Add(id + '-' + name + '.' + extension);
322		end;
323		fields.Free;
324		end;
#	Line 318 | Line 328 | end;
328
329
330
331	<	function TOniDataDat.GetFilesCount: LongWord;
331	>	function TAccess_OniArchive.GetFileCount: Integer;
332		begin
333	<	Result := Fdat_header.Files;
333	>	Result := Length(Fdat_files);
334		end;
335
336
337
338
339	<	function TOniDataDat.GetExtensionsList: TStringArray;
339	>	function TAccess_OniArchive.GetExtensionsList(ExtListFormat: TExtensionFormat): TStrings;
340		var
341	<	i: LongWord;
341	>	i: Integer;
342		begin
343	<	SetLength(Result, Fdat_header.Extensions);
344	<	for i := 0 to Fdat_header.Extensions - 1 do
343	>	if not Assigned(Result) then
344	>	Result := TStringList.Create;
345	>	if Result is TStringList then
346	>	TStringList(Result).Sorted := True;
347	>	for i := 0 to Length(Fdat_extensionsmap) - 1 do
348		begin
349		with Fdat_extensionsmap[i] do
350		begin
351	<	Result[i] := Extension[3] + Extension[2] + Extension[1] + Extension[0] +
352	<	' (' + IntToStr(ExtCount) + ')';
351	>	case ExtListFormat of
352	>	EF_ExtOnly:
353	>	Result.Add(Extension[3] + Extension[2] + Extension[1] + Extension[0]);
354	>	EF_ExtCount:
355	>	Result.Add(Extension[3] + Extension[2] + Extension[1] + Extension[0] +
356	>	' (' + IntToStr(ExtCount) + ')');
357	>	end;
358		end;
359		end;
360		end;
361
362
363
364	<
347	<	function TOniDataDat.GetExtendedExtensionsList: TExtensionsMap;
364	>	procedure TAccess_OniArchive.LoadDatFile(FileID: Integer; var Target: TStream);
365		var
366	<	i: LongWord;
366	>	streampos: Integer;
367		begin
368	<	SetLength(Result, Fdat_header.Extensions);
352	<	for i := 0 to Fdat_header.Extensions - 1 do
368	>	if fileid < GetFileCount then
369		begin
370	<	Result[i] := Fdat_extensionsmap[i];
371	<	end;
372	<	end;
357	<
358	<
359	<
360	<
361	<	function TOniDataDat.LoadDatFile(fileid: LongWord): Tdata;
362	<	begin
363	<	if fileid < Self.GetFilesCount then
364	<	begin
365	<	if FUnloadWhenUnused or not FDatOpened then
370	>	if not Assigned(Target) then
371	>	Target := TMemoryStream.Create;
372	>	if not FDatOpened then
373		Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
374		Fdat_file.Seek(Fdat_files[fileid].DatAddr, soFromBeginning);
375	<	SetLength(Result, Fdat_files[fileid].Size);
376	<	Fdat_file.Read(Result[0], Fdat_files[fileid].Size);
375	>	streampos := Target.Position;
376	>	Target.CopyFrom(Fdat_file, Fdat_files[fileid].Size);
377	>	Target.Seek(streampos, soFromBeginning);
378		if UnloadWhenUnused then
379	<	Fdat_file.Free
379	>	begin
380	>	Fdat_file.Free;
381	>	FDatOpened := False;
382	>	end
383		else
384		FDatOpened := True;
385		end;
386		end;
387
388	<
378	<
379	<
380	<	procedure TOniDataDat.UpdateDatFile(fileid: LongWord; Data: Tdata);
388	>	procedure TAccess_OniArchive.UpdateDatFile(FileID: Integer; Src: TStream);
389		begin
390	<	if fileid < Self.GetFilesCount then
390	>	if fileid < GetFileCount then
391		begin
392	<	if FUnloadWhenUnused or not FDatOpened then
392	>	if not FDatOpened then
393		Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
394		Fdat_file.Seek(Fdat_files[fileid].DatAddr, soFromBeginning);
395	<	Fdat_file.Write(Data[0], Length(Data));
395	>	Fdat_file.CopyFrom(Src, Fdat_files[fileid].Size);
396		if UnloadWhenUnused then
397	<	Fdat_file.Free
397	>	begin
398	>	Fdat_file.Free;
399	>	FDatOpened := False;
400	>	end
401		else
402		FDatOpened := True;
403		end;
404		end;
405
406	<
407	<
408	<
398	<	procedure TOniDataDat.LoadDatFilePart(fileid, offset, size: LongWord; target: Pointer);
406	>	procedure TAccess_OniArchive.LoadDatFilePart(FileID, Offset, Size: Integer; var Target: TStream);
407	>	var
408	>	streampos: Integer;
409		begin
410	<	if fileid < Self.GetFilesCount then
410	>	if fileid < GetFileCount then
411		begin
412	<	if FUnloadWhenUnused or not FDatOpened then
412	>	if not Assigned(Target) then
413	>	Target := TMemoryStream.Create;
414	>	if not FDatOpened then
415		Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
416		Fdat_file.Seek(Fdat_files[fileid].DatAddr + offset, soFromBeginning);
417	<	Fdat_file.Read(target^, size);
417	>	streampos := Target.Position;
418	>	Target.CopyFrom(Fdat_file, size);
419	>	Target.Seek(streampos, soFromBeginning);
420		if UnloadWhenUnused then
421	<	Fdat_file.Free
421	>	begin
422	>	FDatOpened := False;
423	>	Fdat_file.Free;
424	>	end
425		else
426		FDatOpened := True;
427		end;
428		end;
429
430	<
414	<
415	<
416	<	procedure TOniDataDat.UpdateDatFilePart(fileid, offset, size: LongWord; target: Pointer);
430	>	procedure TAccess_OniArchive.UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TStream);
431		begin
432	<	if fileid < Self.GetFilesCount then
432	>	if fileid < GetFileCount then
433		begin
434	<	if FUnloadWhenUnused or not FDatOpened then
434	>	if not FDatOpened then
435		Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
436		Fdat_file.Seek(Fdat_files[fileid].DatAddr + offset, soFromBeginning);
437	<	Fdat_file.Write(target^, size);
437	>	Fdat_file.CopyFrom(Src, Size);
438		if UnloadWhenUnused then
439	<	Fdat_file.Free
439	>	begin
440	>	Fdat_file.Free;
441	>	FDatOpened := False;
442	>	end
443		else
444		FDatOpened := True;
445		end;
#	Line 430 | Line 447 | end;
447
448
449
450	+	function TAccess_OniArchive.GetDatLink(FileID, DatOffset: Integer): TDatLink;
451	+	var
452	+	link: Integer;
453	+	begin
454	+	Result := DatLinksManager.GetDatLink(FConnectionID, FileID, DatOffset);
455	+	LoadDatFilePart(fileid, Result.SrcOffset, 4, @link);
456	+	if link > 0 then
457	+	Result.DestID := link div 256
458	+	else
459	+	Result.DestID := -1;
460	+	end;
461	+
462
463	<	function TOniDataDat.GetRawList(fileid: LongWord): TRawList;
463	>	function TAccess_OniArchive.GetDatLinks(FileID: Integer): TDatLinkList;
464		var
465	<	i: LongWord;
465	>	i: Integer;
466	>	link: Integer;
467		begin
468	<	SetLength(Result, 0);
469	<	for i := 0 to High(RawListHandlers) do
470	<	if UpperCase(RawListHandlers[i].Ext) = UpperCase(Fdat_files[fileid].extension) then
471	<	if RawListHandlers[i].needed then
472	<	begin
473	<	Result := RawListHandlers[i].Handler(Self, fileid);
474	<	Break;
475	<	end
468	>	Result := DatLinksManager.GetDatLinks(FConnectionID, FileID);
469	>	if Length(Result) > 0 then
470	>	begin
471	>	for i := 0 to High(Result) do
472	>	begin
473	>	LoadDatFilePart(fileid, Result[i].SrcOffset, 4, @link);
474	>	if link > 0 then
475	>	Result[i].DestID := link div 256
476		else
477	<	Break;
477	>	Result[i].DestID := -1;
478	>	end;
479	>	end;
480		end;
481
482
483	+	function TAccess_OniArchive.GetRawList(FileID: Integer): TRawDataList;
484	+	begin
485	+	Result := RawLists.GetRawList(FConnectionID, FileID);
486	+	end;
487	+
488	+
489	+	function TAccess_OniArchive.GetRawInfo(FileID, DatOffset: Integer): TRawDataInfo;
490	+	begin
491	+	Result := RawLists.GetRawInfo(FConnectionID, FileID, DatOffset);
492	+	end;
493	+
494
495
496	<	procedure TOniDataDat.LoadRawOffset(loc_sep: Boolean; raw_addr, size: LongWord;
454	<	target: Pointer);
496	>	procedure TAccess_OniArchive.LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; var target: TStream);
497		begin
498	<	if not loc_sep then
498	>	if not Assigned(Target) then
499	>	Target := TMemoryStream.Create;
500	>	if not LocSep then
501		begin
502	<	if FUnloadWhenUnused or not FRawOpened then
502	>	if not FRawOpened then
503		Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
504		fmOpenReadWrite);
505	<	if raw_addr <= Fraw_file.Size then
505	>	if RawAddr <= Fraw_file.Size then
506		begin
507	<	Fraw_file.Seek(raw_addr, soFromBeginning);
508	<	Fraw_file.Read(target^, size);
507	>	Fraw_file.Seek(RawAddr, soFromBeginning);
508	>	Target.CopyFrom(Fraw_file, size);
509	>	Target.Seek(0, soFromBeginning);
510		end;
511		if UnloadWhenUnused then
512	<	Fraw_file.Free
512	>	begin
513	>	FRawOpened := False;
514	>	Fraw_file.Free;
515	>	end
516		else
517		FRawOpened := True;
518		end
519		else
520		begin
521	<	if FUnloadWhenUnused or not FSepOpened then
521	>	if not FSepOpened then
522		Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
523		fmOpenReadWrite);
524	<	if raw_addr <= Fsep_file.Size then
524	>	if RawAddr <= Fsep_file.Size then
525		begin
526	<	Fsep_file.Seek(raw_addr, soFromBeginning);
527	<	Fsep_file.Read(target^, size);
526	>	Fsep_file.Seek(RawAddr, soFromBeginning);
527	>	Target.CopyFrom(Fsep_file, size);
528	>	Target.Seek(0, soFromBeginning);
529		end;
530		if UnloadWhenUnused then
531	<	Fsep_file.Free
531	>	begin
532	>	FSepOpened := False;
533	>	Fsep_file.Free;
534	>	end
535		else
536		FSepOpened := True;
537		end;
538		end;
539
540	+	procedure TAccess_OniArchive.LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; target: Pointer);
541	+	var
542	+	data: TStream;
543	+	begin
544	+	data := nil;
545	+	LoadRawOffset(LocSep, RawAddr, Size, data);
546	+	data.Read(Target^, Size);
547	+	data.Free;
548	+	end;
549
550	<
490	<
491	<	procedure TOniDataDat.LoadRawFile(fileid, dat_offset: LongWord; target: Pointer);
550	>	procedure TAccess_OniArchive.LoadRawFile(FileID, DatOffset: Integer; var Target: TStream);
551		var
552	<	raw_info: TRawInfo;
552	>	raw_info: TRawDataInfo;
553	>	streampos: Integer;
554		begin
555	<	if fileid < Self.GetFilesCount then
555	>	if not Assigned(Target) then
556	>	Target := TMemoryStream.Create;
557	>	if fileid < GetFileCount then
558		begin
559	<	raw_info := Self.GetRawInfo(fileid, dat_offset);
560	<	if not raw_info.loc_sep then
559	>	raw_info := Self.GetRawInfo(FileID, DatOffset);
560	>	if not raw_info.LocSep then
561		begin
562	<	if FUnloadWhenUnused or not FRawOpened then
562	>	if not FRawOpened then
563		Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
564		fmOpenReadWrite);
565	<	Fraw_file.Seek(raw_info.raw_addr, soFromBeginning);
566	<	Fraw_file.Read(target^, raw_info.raw_size);
565	>	Fraw_file.Seek(raw_info.RawAddr, soFromBeginning);
566	>	streampos := Target.Position;
567	>	Target.CopyFrom(Fraw_file, raw_info.RawSize);
568	>	Target.Seek(streampos, soFromBeginning);
569		if UnloadWhenUnused then
570	<	Fraw_file.Free
570	>	begin
571	>	FRawOpened := False;
572	>	Fraw_file.Free;
573	>	end
574		else
575		FRawOpened := True;
576		end
#	Line 512 | Line 579 | begin
579		if FUnloadWhenUnused or not FSepOpened then
580		Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
581		fmOpenReadWrite);
582	<	Fsep_file.Seek(raw_info.raw_addr, soFromBeginning);
583	<	Fsep_file.Read(target^, raw_info.raw_size);
582	>	Fsep_file.Seek(raw_info.RawAddr, soFromBeginning);
583	>	streampos := Target.Position;
584	>	Target.CopyFrom(Fsep_file, raw_info.RawSize);
585	>	Target.Seek(streampos, soFromBeginning);
586		if UnloadWhenUnused then
587	<	Fsep_file.Free
587	>	begin
588	>	FSepOpened := False;
589	>	Fsep_file.Free;
590	>	end
591		else
592		FSepOpened := True;
593		end;
594		end;
595		end;
596
597	<
526	<
527	<
528	<	procedure TOniDataDat.UpdateRawFile(fileid, dat_offset: LongWord;
529	<	size: LongWord; target: Pointer);
597	>	procedure TAccess_OniArchive.UpdateRawFile(FileID, DatOffset: Integer; Src: TStream);
598		var
599	<	raw_info: TRawInfo;
599	>	raw_info: TRawDataInfo;
600		begin
601	<	if fileid < Self.GetFilesCount then
601	>	if fileid < GetFileCount then
602		begin
603	<	raw_info := Self.GetRawInfo(fileid, dat_offset);
604	<	if not raw_info.loc_sep then
603	>	raw_info := GetRawInfo(FileID, DatOffset);
604	>	if not raw_info.LocSep then
605		begin
606	<	if FUnloadWhenUnused or not FRawOpened then
606	>	if not FRawOpened then
607		Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
608		fmOpenReadWrite);
609	<	Fraw_file.Seek(raw_info.raw_addr, soFromBeginning);
610	<	Fraw_file.Write(target^, raw_info.raw_size);
609	>	Fraw_file.Seek(raw_info.RawAddr, soFromBeginning);
610	>	Fraw_file.CopyFrom(Src, Min(raw_info.RawSize, Src.Size));
611		if UnloadWhenUnused then
612	<	Fraw_file.Free
612	>	begin
613	>	FRawOpened := False;
614	>	Fraw_file.Free;
615	>	end
616		else
617		FRawOpened := True;
618		end
619		else
620		begin
621	<	if FUnloadWhenUnused or not FSepOpened then
621	>	if not FSepOpened then
622		Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
623		fmOpenReadWrite);
624	<	Fsep_file.Seek(raw_info.raw_addr, soFromBeginning);
625	<	Fsep_file.Write(target^, raw_info.raw_size);
624	>	Fsep_file.Seek(raw_info.RawAddr, soFromBeginning);
625	>	Fsep_file.CopyFrom(Src, raw_info.RawSize);
626		if UnloadWhenUnused then
627	<	Fsep_file.Free
627	>	begin
628	>	FSepOpened := False;
629	>	Fsep_file.Free;
630	>	end
631		else
632		FSepOpened := True;
633		end;
634		end;
635		end;
636
637	<
564	<
565	<
566	<	procedure TOniDataDat.LoadRawFilePart(fileid, dat_offset: LongWord;
567	<	offset, size: LongWord; target: Pointer);
637	>	procedure TAccess_OniArchive.LoadRawFilePart(FileID, DatOffset, Offset, Size: Integer; var Target: TStream);
638		var
639	<	raw_info: TRawInfo;
640	<	Data:     Tdata;
571	<	mem:      TMemoryStream;
639	>	Data: TStream;
640	>	streampos: Integer;
641		begin
642	<	if fileid < Self.GetFilesCount then
642	>	if not Assigned(Target) then
643	>	Target := TMemoryStream.Create;
644	>	if fileid < Self.GetFileCount then
645		begin
646	<	raw_info := Self.GetRawInfo(fileid, dat_offset);
647	<	SetLength(Data, raw_info.raw_size);
648	<	Self.LoadRawFile(fileid, dat_offset, @Data[0]);
649	<	mem := TMemoryStream.Create;
650	<	mem.Write(Data[offset], size);
651	<	mem.Read(target^, size);
581	<	mem.Free;
646	>	data := nil;
647	>	LoadRawFile(FileID, DatOffset, Data);
648	>	Data.Seek(Offset, soFromBeginning);
649	>	streampos := Target.Position;
650	>	Target.CopyFrom(Data, Size);
651	>	Target.Seek(streampos, soFromBeginning);
652		end;
653		end;
654
655
656	<
587	<
588	<	procedure TOniDataDat.UpdateRawFilePart(fileid, dat_offset: LongWord;
589	<	offset, size: LongWord; target: Pointer);
656	>	procedure TAccess_OniArchive.UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TStream);
657		var
658	<	raw_info: TRawInfo;
658	>	raw_info: TRawDataInfo;
659		begin
660	<	if fileid < Self.GetFilesCount then
660	>	if fileid < GetFileCount then
661		begin
662	<	raw_info := Self.GetRawInfo(fileid, dat_offset);
663	<	if not raw_info.loc_sep then
662	>	raw_info := GetRawInfo(FileID, DatOffset);
663	>	if not raw_info.LocSep then
664		begin
665	<	if FUnloadWhenUnused or not FRawOpened then
665	>	if not FRawOpened then
666		Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
667		fmOpenReadWrite);
668	<	Fraw_file.Seek(raw_info.raw_addr + offset, soFromBeginning);
669	<	Fraw_file.Write(target^, raw_info.raw_size);
668	>	Fraw_file.Seek(raw_info.RawAddr + Offset, soFromBeginning);
669	>	Fraw_file.CopyFrom(Src, Size);
670		if UnloadWhenUnused then
671	<	Fraw_file.Free
671	>	begin
672	>	FRawOpened := False;
673	>	Fraw_file.Free;
674	>	end
675		else
676		FRawOpened := True;
677		end
678		else
679		begin
680	<	if FUnloadWhenUnused or not FSepOpened then
680	>	if not FSepOpened then
681		Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
682		fmOpenReadWrite);
683	<	Fsep_file.Seek(raw_info.raw_addr + offset, soFromBeginning);
684	<	Fsep_file.Write(target^, raw_info.raw_size);
683	>	Fsep_file.Seek(raw_info.RawAddr + Offset, soFromBeginning);
684	>	Fsep_file.CopyFrom(Src, Size);
685		if UnloadWhenUnused then
686	<	Fsep_file.Free
686	>	begin
687	>	FSepOpened := False;
688	>	Fsep_file.Free;
689	>	end
690		else
691		FSepOpened := True;
692		end;
693		end;
694		end;
695
696	<
697	<
698	<
699	<	function TOniDataDat.AppendRawFile(loc_sep: Boolean; size: LongWord;
627	<	target: Pointer): LongWord; //Returns new Address
696	>	function TAccess_OniArchive.AppendRawFile(LocSep: Boolean; Src: TStream): Integer;
697	>	const
698	>	EmptyBytes: Array[0..31] of Byte = (
699	>	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 );
700		begin
701	<	if not loc_sep then
701	>	if not LocSep then
702		begin
703	<	if FUnloadWhenUnused or not FRawOpened then
703	>	if not FRawOpened then
704		Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
705		fmOpenReadWrite);
706	+	if (Fraw_file.Size mod 32) > 0 then
707	+	Fraw_file.Write(EmptyBytes[0], 32 - (Fraw_file.Size mod 32));
708		Result := Fraw_file.Size;
709		Fraw_file.Seek(0, soFromEnd);
710	<	Fraw_file.Write(target^, size);
710	>	Fraw_file.CopyFrom(Src, Src.Size);
711	>	if (Fraw_file.Size mod 32) > 0 then
712	>	Fraw_file.Write(EmptyBytes[0], 32 - (Fraw_file.Size mod 32));
713		if UnloadWhenUnused then
714	<	Fraw_file.Free
714	>	begin
715	>	FRawOpened := False;
716	>	Fraw_file.Free;
717	>	end
718		else
719		FRawOpened := True;
720		end
721		else
722		begin
723	<	if FUnloadWhenUnused or not FSepOpened then
723	>	if not FSepOpened then
724		Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
725		fmOpenReadWrite);
726	+	if (Fsep_file.Size mod 32) > 0 then
727	+	Fsep_file.Write(EmptyBytes[0], 32 - (Fsep_file.Size mod 32));
728		Result := Fsep_file.Size;
729		Fsep_file.Seek(0, soFromEnd);
730	<	Fsep_file.Write(target^, size);
730	>	Fsep_file.CopyFrom(Src, Src.Size);
731	>	if (Fsep_file.Size mod 32) > 0 then
732	>	Fsep_file.Write(EmptyBytes[0], 32 - (Fsep_file.Size mod 32));
733		if UnloadWhenUnused then
734	<	Fsep_file.Free
734	>	begin
735	>	FSepOpened := False;
736	>	Fsep_file.Free;
737	>	end
738		else
739		FSepOpened := True;
740		end;
741		end;
742
657	–
658	–	}
659	–
660	–
661	–
662	–
743		end.

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)