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 229 by alloc, Wed Jun 20 10:57:51 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	>
164	>	inherited;
165	>	end;
166	>
167	>
168	>
169	>
170	>	procedure TAccess_OniArchive.SetUnloadWhenUnused(doit: Boolean);
171	>	begin
172	>	FUnloadWhenUnused := doit;
173	>	if FUnloadWhenUnused then
174	>	begin
175	>	if FDatOpened then
176	>	begin
177	>	FDatOpened := False;
178	>	Fdat_file.Free;
179	>	end;
180	>	if FRawOpened then
181	>	begin
182	>	FRawOpened := False;
183	>	Fraw_file.Free;
184	>	end;
185	>	if FSepOpened then
186	>	begin
187	>	FSepOpened := False;
188	>	Fsep_file.Free;
189	>	end;
190	>	end
191	>	else
192	>	begin
193	>	if not FDatOpened then
194	>	begin
195	>	Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
196	>	FDatOpened := True;
197	>	end;
198	>	if not FRawOpened then
199	>	begin
200	>	Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
201	>	fmOpenReadWrite);
202	>	FRawOpened := True;
203	>	end;
204	>	if (not FSepOpened) and (FDataOS <> DOS_WIN) then
205	>	begin
206	>	Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
207	>	fmOpenReadWrite);
208	>	FSepOpened := True;
209	>	end;
210	>	end;
211		end;
212
213
214
215
216	<	procedure TOniDataDat.Close;
216	>
217	>	procedure TAccess_OniArchive.Close;
218		begin
219	<	if not FUnloadWhenUnused and FDatOpened then
219	>	if FDatOpened then
220		Fdat_file.Free;
221	<	if not FUnloadWhenUnused and FRawOpened then
221	>	if FRawOpened then
222		Fraw_file.Free;
223	<	if not FUnloadWhenUnused and FSepOpened then
223	>	if FSepOpened then
224		Fsep_file.Free;
225		Self.Free;
226		end;
#	Line 221 | Line 228 | end;
228
229
230
231	<	function TOniDataDat.GetFileInfo(fileid: Integer): TFileInfo;
231	>	function TAccess_OniArchive.GetFileInfo(fileid: Integer): TFileInfo;
232		begin
233		if fileid = -1 then
234		begin
235		Result := inherited GetFileInfo(fileid);
236		Exit;
237		end;
238	<	if fileid < Self.GetFilesCount then
238	>	if fileid < Self.GetFileCount then
239		Result    := Fdat_files[fileid]
240		else
241		Result.ID := -1;
#	Line 237 | Line 244 | end;
244
245
246
247	<	function TOniDataDat.GetFilesList(ext: String; pattern: String;
248	<	NoEmptyFiles: Boolean; sort: TSortType): TStringArray;
247	>	function TAccess_OniArchive.GetFilesList(ext: String; pattern: String;
248	>	NoEmptyFiles: Boolean; SortType: TSortType): TStrings;
249		var
250	<	i: LongWord;
251	<	list: TStringList;
250	>	i:      Integer;
251	>	list:   TStringList;
252		id, name, extension: String;
253		fields: TStrings;
254
255		procedure getfields;
256		begin
257	<	fields.CommaText := StringReplace(AnsiQuotedStr(list.Strings[i], '"'), ';', '","', [rfReplaceAll]);
258	<	if sort in [stIDAsc, stIDDesc] then
257	>	fields.CommaText := StringReplace(AnsiQuotedStr(list.Strings[i], '"'), ';', '","', [rfReplaceAll]);
258	>	if SortType in [ST_IDAsc, ST_IDDesc] then
259		begin
260		id := fields.Strings[0];
261		name := fields.Strings[1];
262		extension := fields.Strings[2];
263		end;
264	<	if sort in [stNameAsc, stNameDesc] then
264	>	if SortType in [ST_NameAsc, ST_NameDesc] then
265		begin
266		id := fields.Strings[1];
267		name := fields.Strings[0];
268		extension := fields.Strings[2];
269		end;
270	<	if sort in [stExtAsc, stExtDesc] then
270	>	if SortType in [ST_ExtAsc, ST_ExtDesc] then
271		begin
272		id := fields.Strings[1];
273		name := fields.Strings[2];
274		extension := fields.Strings[0];
275		end;
276	+	if SortType in [ST_ExtNameAsc, ST_ExtNameDesc] then
277	+	begin
278	+	id := fields.Strings[2];
279	+	name := fields.Strings[1];
280	+	extension := fields.Strings[0];
281	+	end;
282		end;
283
284		begin
285		list := TStringList.Create;
286		list.Sorted := True;
287	<	for i := 0 to Fdat_header.Files - 1 do
287	>	for i := 0 to GetFileCount - 1 do
288		begin
289		if ((Length(ext) = 0) or (Pos(Fdat_files[i].Extension, ext) > 0)) and
290		((Length(pattern) = 0) or
#	Line 279 | Line 292 | begin
292		begin
293		if (NoEmptyFiles = False) or ((Fdat_files[i].FileType and $02) = 0) then
294		begin
295	<	if AppSettings.FilenumbersAsHex then
283	<	id := IntToHex(Fdat_files[i].ID, 4)
284	<	else
285	<	id := FormatNumber(Fdat_files[i].ID, 5, '0');
295	>	id := FormatNumber(Fdat_files[i].ID, 5, '0');
296		name := Fdat_files[i].Name;
297		extension := Fdat_files[i].Extension;
298
299	<	case sort of
300	<	stIDAsc, stIDDesc:     list.Add(id + ';' + name + ';' + extension);
301	<	stNameAsc, stNameDesc: list.Add(name + ';' + id + ';' + extension);
302	<	stExtAsc, stExtDesc:   list.Add(extension + ';' + id + ';' + name);
299	>	case SortType of
300	>	ST_IDAsc, ST_IDDesc:     list.Add(id + ';' + name + ';' + extension);
301	>	ST_NameAsc, ST_NameDesc: list.Add(name + ';' + id + ';' + extension);
302	>	ST_ExtAsc, ST_ExtDesc:   list.Add(extension + ';' + id + ';' + name);
303	>	ST_ExtNameAsc, ST_ExtNameDesc: list.Add(name + ';' + extension + ';' + id);
304		end;
305		end;
306		end;
307		end;
308	<	SetLength(Result, list.Count);
309	<	if Length(Result) > 0 then
308	>	if not Assigned(Result) then
309	>	Result := TStringList.Create;
310	>	if list.Count > 0 then
311		begin
312		fields := TStringList.Create;
313	<	if sort in [stIDAsc, stNameAsc, stExtAsc] then
313	>	if SortType in [ST_IDAsc, ST_NameAsc, ST_ExtAsc, ST_ExtNameAsc] then
314		for i := 0 to list.Count - 1 do
315		begin
316		getfields;
317	<	Result[i] := id + '-' + name + '.' + extension;
317	>	Result.Add(id + '-' + name + '.' + extension);
318		end
319		else
320		for i := list.Count - 1 downto 0 do
321		begin
322		getfields;
323	<	Result[list.Count - i - 1] := id + '-' + name + '.' + extension;
323	>	Result.Add(id + '-' + name + '.' + extension);
324		end;
325		fields.Free;
326		end;
#	Line 318 | Line 330 | end;
330
331
332
333	<	function TOniDataDat.GetFilesCount: LongWord;
333	>	function TAccess_OniArchive.GetFileCount: Integer;
334		begin
335	<	Result := Fdat_header.Files;
335	>	Result := Length(Fdat_files);
336		end;
337
338
339
340
341	<	function TOniDataDat.GetExtensionsList: TStringArray;
341	>	function TAccess_OniArchive.GetExtensionsList(ExtListFormat: TExtensionFormat): TStrings;
342		var
343	<	i: LongWord;
343	>	i: Integer;
344		begin
345	<	SetLength(Result, Fdat_header.Extensions);
346	<	for i := 0 to Fdat_header.Extensions - 1 do
345	>	if not Assigned(Result) then
346	>	Result := TStringList.Create;
347	>	if Result is TStringList then
348	>	TStringList(Result).Sorted := True;
349	>	for i := 0 to Length(Fdat_extensionsmap) - 1 do
350		begin
351		with Fdat_extensionsmap[i] do
352		begin
353	<	Result[i] := Extension[3] + Extension[2] + Extension[1] + Extension[0] +
354	<	' (' + IntToStr(ExtCount) + ')';
353	>	case ExtListFormat of
354	>	EF_ExtOnly:
355	>	Result.Add(Extension[3] + Extension[2] + Extension[1] + Extension[0]);
356	>	EF_ExtCount:
357	>	Result.Add(Extension[3] + Extension[2] + Extension[1] + Extension[0] +
358	>	' (' + IntToStr(ExtCount) + ')');
359	>	end;
360		end;
361		end;
362		end;
363
364
365
366	<
347	<	function TOniDataDat.GetExtendedExtensionsList: TExtensionsMap;
366	>	procedure TAccess_OniArchive.LoadDatFile(FileID: Integer; var Target: TStream);
367		var
368	<	i: LongWord;
350	<	begin
351	<	SetLength(Result, Fdat_header.Extensions);
352	<	for i := 0 to Fdat_header.Extensions - 1 do
353	<	begin
354	<	Result[i] := Fdat_extensionsmap[i];
355	<	end;
356	<	end;
357	<
358	<
359	<
360	<
361	<	function TOniDataDat.LoadDatFile(fileid: LongWord): Tdata;
368	>	streampos: Integer;
369		begin
370	<	if fileid < Self.GetFilesCount then
370	>	if fileid < GetFileCount then
371		begin
372	<	if FUnloadWhenUnused or not FDatOpened then
372	>	if not Assigned(Target) then
373	>	Target := TMemoryStream.Create;
374	>	if not FDatOpened then
375		Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
376		Fdat_file.Seek(Fdat_files[fileid].DatAddr, soFromBeginning);
377	<	SetLength(Result, Fdat_files[fileid].Size);
378	<	Fdat_file.Read(Result[0], Fdat_files[fileid].Size);
377	>	streampos := Target.Position;
378	>	Target.CopyFrom(Fdat_file, Fdat_files[fileid].Size);
379	>	Target.Seek(streampos, soFromBeginning);
380		if UnloadWhenUnused then
381	<	Fdat_file.Free
381	>	begin
382	>	Fdat_file.Free;
383	>	FDatOpened := False;
384	>	end
385		else
386		FDatOpened := True;
387		end;
388		end;
389
390	<
378	<
379	<
380	<	procedure TOniDataDat.UpdateDatFile(fileid: LongWord; Data: Tdata);
390	>	procedure TAccess_OniArchive.UpdateDatFile(FileID: Integer; Src: TStream);
391		begin
392	<	if fileid < Self.GetFilesCount then
392	>	if fileid < GetFileCount then
393		begin
394	<	if FUnloadWhenUnused or not FDatOpened then
394	>	if not FDatOpened then
395		Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
396		Fdat_file.Seek(Fdat_files[fileid].DatAddr, soFromBeginning);
397	<	Fdat_file.Write(Data[0], Length(Data));
397	>	Fdat_file.CopyFrom(Src, Fdat_files[fileid].Size);
398		if UnloadWhenUnused then
399	<	Fdat_file.Free
399	>	begin
400	>	Fdat_file.Free;
401	>	FDatOpened := False;
402	>	end
403		else
404		FDatOpened := True;
405		end;
406		end;
407
408	<
409	<
410	<
398	<	procedure TOniDataDat.LoadDatFilePart(fileid, offset, size: LongWord; target: Pointer);
408	>	procedure TAccess_OniArchive.LoadDatFilePart(FileID, Offset, Size: Integer; var Target: TStream);
409	>	var
410	>	streampos: Integer;
411		begin
412	<	if fileid < Self.GetFilesCount then
412	>	if fileid < GetFileCount then
413		begin
414	<	if FUnloadWhenUnused or not FDatOpened then
414	>	if not Assigned(Target) then
415	>	Target := TMemoryStream.Create;
416	>	if not FDatOpened then
417		Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
418		Fdat_file.Seek(Fdat_files[fileid].DatAddr + offset, soFromBeginning);
419	<	Fdat_file.Read(target^, size);
419	>	streampos := Target.Position;
420	>	Target.CopyFrom(Fdat_file, size);
421	>	Target.Seek(streampos, soFromBeginning);
422		if UnloadWhenUnused then
423	<	Fdat_file.Free
423	>	begin
424	>	FDatOpened := False;
425	>	Fdat_file.Free;
426	>	end
427		else
428		FDatOpened := True;
429		end;
430		end;
431
432	<
414	<
415	<
416	<	procedure TOniDataDat.UpdateDatFilePart(fileid, offset, size: LongWord; target: Pointer);
432	>	procedure TAccess_OniArchive.UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TStream);
433		begin
434	<	if fileid < Self.GetFilesCount then
434	>	if fileid < GetFileCount then
435		begin
436	<	if FUnloadWhenUnused or not FDatOpened then
436	>	if not FDatOpened then
437		Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
438		Fdat_file.Seek(Fdat_files[fileid].DatAddr + offset, soFromBeginning);
439	<	Fdat_file.Write(target^, size);
439	>	Fdat_file.CopyFrom(Src, Size);
440		if UnloadWhenUnused then
441	<	Fdat_file.Free
441	>	begin
442	>	Fdat_file.Free;
443	>	FDatOpened := False;
444	>	end
445		else
446		FDatOpened := True;
447		end;
#	Line 430 | Line 449 | end;
449
450
451
452	+	function TAccess_OniArchive.GetDatLink(FileID, DatOffset: Integer): TDatLink;
453	+	var
454	+	link: Integer;
455	+	begin
456	+	Result := DatLinksManager.GetDatLink(FConnectionID, FileID, DatOffset);
457	+	LoadDatFilePart(fileid, Result.SrcOffset, 4, @link);
458	+	if link > 0 then
459	+	Result.DestID := link div 256
460	+	else
461	+	Result.DestID := -1;
462	+	end;
463	+
464
465	<	function TOniDataDat.GetRawList(fileid: LongWord): TRawList;
465	>	function TAccess_OniArchive.GetDatLinks(FileID: Integer): TDatLinkList;
466		var
467	<	i: LongWord;
467	>	i: Integer;
468	>	link: Integer;
469		begin
470	<	SetLength(Result, 0);
471	<	for i := 0 to High(RawListHandlers) do
472	<	if UpperCase(RawListHandlers[i].Ext) = UpperCase(Fdat_files[fileid].extension) then
473	<	if RawListHandlers[i].needed then
474	<	begin
475	<	Result := RawListHandlers[i].Handler(Self, fileid);
476	<	Break;
477	<	end
470	>	Result := DatLinksManager.GetDatLinks(FConnectionID, FileID);
471	>	if Length(Result) > 0 then
472	>	begin
473	>	for i := 0 to High(Result) do
474	>	begin
475	>	LoadDatFilePart(fileid, Result[i].SrcOffset, 4, @link);
476	>	if link > 0 then
477	>	Result[i].DestID := link div 256
478		else
479	<	Break;
479	>	Result[i].DestID := -1;
480	>	end;
481	>	end;
482		end;
483
484
485	+	function TAccess_OniArchive.GetRawList(FileID: Integer): TRawDataList;
486	+	begin
487	+	Result := RawLists.GetRawList(FConnectionID, FileID);
488	+	end;
489	+
490	+
491	+	function TAccess_OniArchive.GetRawInfo(FileID, DatOffset: Integer): TRawDataInfo;
492	+	begin
493	+	Result := RawLists.GetRawInfo(FConnectionID, FileID, DatOffset);
494	+	end;
495	+
496
497
498	<	procedure TOniDataDat.LoadRawOffset(loc_sep: Boolean; raw_addr, size: LongWord;
454	<	target: Pointer);
498	>	procedure TAccess_OniArchive.LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; var target: TStream);
499		begin
500	<	if not loc_sep then
500	>	if not Assigned(Target) then
501	>	Target := TMemoryStream.Create;
502	>	if not LocSep then
503		begin
504	<	if FUnloadWhenUnused or not FRawOpened then
504	>	if not FRawOpened then
505		Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
506		fmOpenReadWrite);
507	<	if raw_addr <= Fraw_file.Size then
507	>	if RawAddr <= Fraw_file.Size then
508		begin
509	<	Fraw_file.Seek(raw_addr, soFromBeginning);
510	<	Fraw_file.Read(target^, size);
509	>	Fraw_file.Seek(RawAddr, soFromBeginning);
510	>	Target.CopyFrom(Fraw_file, size);
511	>	Target.Seek(0, soFromBeginning);
512		end;
513		if UnloadWhenUnused then
514	<	Fraw_file.Free
514	>	begin
515	>	FRawOpened := False;
516	>	Fraw_file.Free;
517	>	end
518		else
519		FRawOpened := True;
520		end
521		else
522		begin
523	<	if FUnloadWhenUnused or not FSepOpened then
523	>	if not FSepOpened then
524		Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
525		fmOpenReadWrite);
526	<	if raw_addr <= Fsep_file.Size then
526	>	if RawAddr <= Fsep_file.Size then
527		begin
528	<	Fsep_file.Seek(raw_addr, soFromBeginning);
529	<	Fsep_file.Read(target^, size);
528	>	Fsep_file.Seek(RawAddr, soFromBeginning);
529	>	Target.CopyFrom(Fsep_file, size);
530	>	Target.Seek(0, soFromBeginning);
531		end;
532		if UnloadWhenUnused then
533	<	Fsep_file.Free
533	>	begin
534	>	FSepOpened := False;
535	>	Fsep_file.Free;
536	>	end
537		else
538		FSepOpened := True;
539		end;
540		end;
541
542	+	procedure TAccess_OniArchive.LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; target: Pointer);
543	+	var
544	+	data: TStream;
545	+	begin
546	+	data := nil;
547	+	LoadRawOffset(LocSep, RawAddr, Size, data);
548	+	data.Read(Target^, Size);
549	+	data.Free;
550	+	end;
551
552	<
490	<
491	<	procedure TOniDataDat.LoadRawFile(fileid, dat_offset: LongWord; target: Pointer);
552	>	procedure TAccess_OniArchive.LoadRawFile(FileID, DatOffset: Integer; var Target: TStream);
553		var
554	<	raw_info: TRawInfo;
554	>	raw_info: TRawDataInfo;
555	>	streampos: Integer;
556		begin
557	<	if fileid < Self.GetFilesCount then
557	>	if not Assigned(Target) then
558	>	Target := TMemoryStream.Create;
559	>	if fileid < GetFileCount then
560		begin
561	<	raw_info := Self.GetRawInfo(fileid, dat_offset);
562	<	if not raw_info.loc_sep then
561	>	raw_info := Self.GetRawInfo(FileID, DatOffset);
562	>	if not raw_info.LocSep then
563		begin
564	<	if FUnloadWhenUnused or not FRawOpened then
564	>	if not FRawOpened then
565		Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
566		fmOpenReadWrite);
567	<	Fraw_file.Seek(raw_info.raw_addr, soFromBeginning);
568	<	Fraw_file.Read(target^, raw_info.raw_size);
567	>	Fraw_file.Seek(raw_info.RawAddr, soFromBeginning);
568	>	streampos := Target.Position;
569	>	Target.CopyFrom(Fraw_file, raw_info.RawSize);
570	>	Target.Seek(streampos, soFromBeginning);
571		if UnloadWhenUnused then
572	<	Fraw_file.Free
572	>	begin
573	>	FRawOpened := False;
574	>	Fraw_file.Free;
575	>	end
576		else
577		FRawOpened := True;
578		end
#	Line 512 | Line 581 | begin
581		if FUnloadWhenUnused or not FSepOpened then
582		Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
583		fmOpenReadWrite);
584	<	Fsep_file.Seek(raw_info.raw_addr, soFromBeginning);
585	<	Fsep_file.Read(target^, raw_info.raw_size);
584	>	Fsep_file.Seek(raw_info.RawAddr, soFromBeginning);
585	>	streampos := Target.Position;
586	>	Target.CopyFrom(Fsep_file, raw_info.RawSize);
587	>	Target.Seek(streampos, soFromBeginning);
588		if UnloadWhenUnused then
589	<	Fsep_file.Free
589	>	begin
590	>	FSepOpened := False;
591	>	Fsep_file.Free;
592	>	end
593		else
594		FSepOpened := True;
595		end;
596		end;
597		end;
598
599	<
526	<
527	<
528	<	procedure TOniDataDat.UpdateRawFile(fileid, dat_offset: LongWord;
529	<	size: LongWord; target: Pointer);
599	>	procedure TAccess_OniArchive.UpdateRawFile(FileID, DatOffset: Integer; Src: TStream);
600		var
601	<	raw_info: TRawInfo;
601	>	raw_info: TRawDataInfo;
602		begin
603	<	if fileid < Self.GetFilesCount then
603	>	if fileid < GetFileCount then
604		begin
605	<	raw_info := Self.GetRawInfo(fileid, dat_offset);
606	<	if not raw_info.loc_sep then
605	>	raw_info := GetRawInfo(FileID, DatOffset);
606	>	if not raw_info.LocSep then
607		begin
608	<	if FUnloadWhenUnused or not FRawOpened then
608	>	if not FRawOpened then
609		Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
610		fmOpenReadWrite);
611	<	Fraw_file.Seek(raw_info.raw_addr, soFromBeginning);
612	<	Fraw_file.Write(target^, raw_info.raw_size);
611	>	Fraw_file.Seek(raw_info.RawAddr, soFromBeginning);
612	>	Fraw_file.CopyFrom(Src, Min(raw_info.RawSize, Src.Size));
613		if UnloadWhenUnused then
614	<	Fraw_file.Free
614	>	begin
615	>	FRawOpened := False;
616	>	Fraw_file.Free;
617	>	end
618		else
619		FRawOpened := True;
620		end
621		else
622		begin
623	<	if FUnloadWhenUnused or not FSepOpened then
623	>	if not FSepOpened then
624		Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
625		fmOpenReadWrite);
626	<	Fsep_file.Seek(raw_info.raw_addr, soFromBeginning);
627	<	Fsep_file.Write(target^, raw_info.raw_size);
626	>	Fsep_file.Seek(raw_info.RawAddr, soFromBeginning);
627	>	Fsep_file.CopyFrom(Src, raw_info.RawSize);
628		if UnloadWhenUnused then
629	<	Fsep_file.Free
629	>	begin
630	>	FSepOpened := False;
631	>	Fsep_file.Free;
632	>	end
633		else
634		FSepOpened := True;
635		end;
636		end;
637		end;
638
639	<
564	<
565	<
566	<	procedure TOniDataDat.LoadRawFilePart(fileid, dat_offset: LongWord;
567	<	offset, size: LongWord; target: Pointer);
639	>	procedure TAccess_OniArchive.LoadRawFilePart(FileID, DatOffset, Offset, Size: Integer; var Target: TStream);
640		var
641	<	raw_info: TRawInfo;
642	<	Data:     Tdata;
571	<	mem:      TMemoryStream;
641	>	Data: TStream;
642	>	streampos: Integer;
643		begin
644	<	if fileid < Self.GetFilesCount then
644	>	if not Assigned(Target) then
645	>	Target := TMemoryStream.Create;
646	>	if fileid < Self.GetFileCount then
647		begin
648	<	raw_info := Self.GetRawInfo(fileid, dat_offset);
649	<	SetLength(Data, raw_info.raw_size);
650	<	Self.LoadRawFile(fileid, dat_offset, @Data[0]);
651	<	mem := TMemoryStream.Create;
652	<	mem.Write(Data[offset], size);
653	<	mem.Read(target^, size);
581	<	mem.Free;
648	>	data := nil;
649	>	LoadRawFile(FileID, DatOffset, Data);
650	>	Data.Seek(Offset, soFromBeginning);
651	>	streampos := Target.Position;
652	>	Target.CopyFrom(Data, Size);
653	>	Target.Seek(streampos, soFromBeginning);
654		end;
655		end;
656
657
658	<
587	<
588	<	procedure TOniDataDat.UpdateRawFilePart(fileid, dat_offset: LongWord;
589	<	offset, size: LongWord; target: Pointer);
658	>	procedure TAccess_OniArchive.UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TStream);
659		var
660	<	raw_info: TRawInfo;
660	>	raw_info: TRawDataInfo;
661		begin
662	<	if fileid < Self.GetFilesCount then
662	>	if fileid < GetFileCount then
663		begin
664	<	raw_info := Self.GetRawInfo(fileid, dat_offset);
665	<	if not raw_info.loc_sep then
664	>	raw_info := GetRawInfo(FileID, DatOffset);
665	>	if not raw_info.LocSep then
666		begin
667	<	if FUnloadWhenUnused or not FRawOpened then
667	>	if not FRawOpened then
668		Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
669		fmOpenReadWrite);
670	<	Fraw_file.Seek(raw_info.raw_addr + offset, soFromBeginning);
671	<	Fraw_file.Write(target^, raw_info.raw_size);
670	>	Fraw_file.Seek(raw_info.RawAddr + Offset, soFromBeginning);
671	>	Fraw_file.CopyFrom(Src, Size);
672		if UnloadWhenUnused then
673	<	Fraw_file.Free
673	>	begin
674	>	FRawOpened := False;
675	>	Fraw_file.Free;
676	>	end
677		else
678		FRawOpened := True;
679		end
680		else
681		begin
682	<	if FUnloadWhenUnused or not FSepOpened then
682	>	if not FSepOpened then
683		Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
684		fmOpenReadWrite);
685	<	Fsep_file.Seek(raw_info.raw_addr + offset, soFromBeginning);
686	<	Fsep_file.Write(target^, raw_info.raw_size);
685	>	Fsep_file.Seek(raw_info.RawAddr + Offset, soFromBeginning);
686	>	Fsep_file.CopyFrom(Src, Size);
687		if UnloadWhenUnused then
688	<	Fsep_file.Free
688	>	begin
689	>	FSepOpened := False;
690	>	Fsep_file.Free;
691	>	end
692		else
693		FSepOpened := True;
694		end;
695		end;
696		end;
697
698	<
699	<
700	<
701	<	function TOniDataDat.AppendRawFile(loc_sep: Boolean; size: LongWord;
627	<	target: Pointer): LongWord; //Returns new Address
698	>	function TAccess_OniArchive.AppendRawFile(LocSep: Boolean; Src: TStream): Integer;
699	>	const
700	>	EmptyBytes: Array[0..31] of Byte = (
701	>	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 );
702		begin
703	<	if not loc_sep then
703	>	if not LocSep then
704		begin
705	<	if FUnloadWhenUnused or not FRawOpened then
705	>	if not FRawOpened then
706		Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
707		fmOpenReadWrite);
708	+	if (Fraw_file.Size mod 32) > 0 then
709	+	Fraw_file.Write(EmptyBytes[0], 32 - (Fraw_file.Size mod 32));
710		Result := Fraw_file.Size;
711		Fraw_file.Seek(0, soFromEnd);
712	<	Fraw_file.Write(target^, size);
712	>	Fraw_file.CopyFrom(Src, Src.Size);
713	>	if (Fraw_file.Size mod 32) > 0 then
714	>	Fraw_file.Write(EmptyBytes[0], 32 - (Fraw_file.Size mod 32));
715		if UnloadWhenUnused then
716	<	Fraw_file.Free
716	>	begin
717	>	FRawOpened := False;
718	>	Fraw_file.Free;
719	>	end
720		else
721		FRawOpened := True;
722		end
723		else
724		begin
725	<	if FUnloadWhenUnused or not FSepOpened then
725	>	if not FSepOpened then
726		Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
727		fmOpenReadWrite);
728	+	if (Fsep_file.Size mod 32) > 0 then
729	+	Fsep_file.Write(EmptyBytes[0], 32 - (Fsep_file.Size mod 32));
730		Result := Fsep_file.Size;
731		Fsep_file.Seek(0, soFromEnd);
732	<	Fsep_file.Write(target^, size);
732	>	Fsep_file.CopyFrom(Src, Src.Size);
733	>	if (Fsep_file.Size mod 32) > 0 then
734	>	Fsep_file.Write(EmptyBytes[0], 32 - (Fsep_file.Size mod 32));
735		if UnloadWhenUnused then
736	<	Fsep_file.Free
736	>	begin
737	>	FSepOpened := False;
738	>	Fsep_file.Free;
739	>	end
740		else
741		FSepOpened := True;
742		end;
743		end;
744
657	–
658	–	}
659	–
660	–
661	–
662	–
745		end.

Diff Legend

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