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 105 by alloc, Wed Feb 21 00:29:27 2007 UTC vs.
oup/current/DataAccess/Access_OniArchive.pas (file contents), Revision 229 by alloc, Wed Jun 20 10:57:51 2007 UTC

#	Line 15 | Line 15 | type
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; ConnectionID: Integer; var Msg: TStatusMessages); override;
24		procedure Close; override;
#	Line 33 | Line 34 | type
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; target: Pointer);
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;
#	Line 49 | Line 53 | type
53		implementation
54
55		uses
56	<	SysUtils, StrUtils, Data, Functions, RawList;
56	>	SysUtils, StrUtils, Data, Functions, RawList, DatLinks, Math;
57
58
59		(*
#	Line 59 | Line 63 | uses
63
64
65		constructor TAccess_OniArchive.Create(DatFilename: String; ConnectionID: Integer; var Msg: TStatusMessages);
62	–	type
63	–	THeader = packed record
64	–	Ident:      array[0..$13] of Byte;
65	–	Files:      Integer;
66	–	NamedFiles: Integer;
67	–	Extensions: Integer;
68	–	DataAddr:   Integer;
69	–	DataSize:   Integer;
70	–	NamesAddr:  Integer;
71	–	NamesSize:  Integer;
72	–	Ident2:     array[0..$F] of Byte;
73	–	end;
74	–	TFilesMap = array of packed record
75	–	Extension: array[0..$3] of Char;
76	–	DataAddr:  Integer;
77	–	NameAddr:  Integer;
78	–	FileSize:  Integer;
79	–	FileType:  LongWord;
80	–	end;
81	–	TNamedFilesMap = array of packed record
82	–	FileNumber: Integer;
83	–	blubb:      Integer;
84	–	end;
85	–	const
86	–	header_ident1_pc: array[0..$13] of Byte =
87	–	($1F, $27, $DC, $33, $DF, $BC, $03, $00, $31, $33, $52, $56, $40, $00,
88	–	$14, $00, $10, $00, $08, $00);
89	–	header_ident1_mac: array[0..$13] of Byte =
90	–	($61, $30, $C1, $23, $DF, $BC, $03, $00, $31, $33, $52, $56, $40, $00,
91	–	$14, $00, $10, $00, $08, $00);
92	–	header_ident1_macbeta: array[0..$13] of Byte =
93	–	($81, $11, $8D, $23, $DF, $BC, $03, $00, $31, $33, $52, $56, $40, $00,
94	–	$14, $00, $10, $00, $08, $00);
95	–	header_ident2: array[0..$F] of Byte =
96	–	($99, $CF, $40, $00, $90, $4F, $63, $00, $F4, $55, $5F, $00, $90, $4F, $63, $00);
66		var
67		i: Integer;
68		header_pc, header_mac, header_macbeta: Boolean;
#	Line 116 | Line 85 | begin
85		header_pc  := True;
86		header_mac := True;
87		header_macbeta := True;
88	<	for i := 0 to High(Fdat_header.Ident) do
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];
122	<	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.Ident[i] <> header_ident1_macbeta[i] then
101	>	if Fdat_header.OSIdent[i] <> HeaderOSIdentMacBeta[i] then
102		header_macbeta := False;
103		end;
104		if not (header_pc xor header_mac xor header_macbeta) then
#	Line 185 | Line 160 | begin
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	+
217		procedure TAccess_OniArchive.Close;
218		begin
219		if FDatOpened then
#	Line 249 | Line 273 | var
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
#	Line 262 | 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
266	<	id := IntToHex(Fdat_files[i].ID, 4)
267	<	else
268	<	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
#	Line 273 | Line 300 | begin
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	<	Result := TStringList.Create;
308	>	if not Assigned(Result) then
309	>	Result := TStringList.Create;
310		if list.Count > 0 then
311		begin
312		fields := TStringList.Create;
313	<	if SortType in [ST_IDAsc, ST_NameAsc, ST_ExtAsc] 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;
#	Line 313 | Line 342 | function TAccess_OniArchive.GetExtension
342		var
343		i: Integer;
344		begin
345	<	Result := TStringList.Create;
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
#	Line 417 | 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 TAccess_OniArchive.GetDatLinks(FileID: Integer): TDatLinkList;
466	+	var
467	+	i: Integer;
468	+	link: Integer;
469	+	begin
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	+	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);
#	Line 430 | Line 495 | end;
495
496
497
498	<
434	<	procedure TAccess_OniArchive.LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; target: Pointer);
498	>	procedure TAccess_OniArchive.LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; var target: TStream);
499		begin
500	+	if not Assigned(Target) then
501	+	Target := TMemoryStream.Create;
502		if not LocSep then
503		begin
504		if not FRawOpened then
#	Line 441 | Line 507 | begin
507		if RawAddr <= Fraw_file.Size then
508		begin
509		Fraw_file.Seek(RawAddr, soFromBeginning);
510	<	Fraw_file.Read(target^, size);
510	>	Target.CopyFrom(Fraw_file, size);
511	>	Target.Seek(0, soFromBeginning);
512		end;
513		if UnloadWhenUnused then
514		begin
#	Line 459 | Line 526 | begin
526		if RawAddr <= Fsep_file.Size then
527		begin
528		Fsep_file.Seek(RawAddr, soFromBeginning);
529	<	Fsep_file.Read(target^, size);
529	>	Target.CopyFrom(Fsep_file, size);
530	>	Target.Seek(0, soFromBeginning);
531		end;
532		if UnloadWhenUnused then
533		begin
#	Line 471 | Line 539 | begin
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		procedure TAccess_OniArchive.LoadRawFile(FileID, DatOffset: Integer; var Target: TStream);
553		var
554		raw_info: TRawDataInfo;
#	Line 531 | Line 609 | begin
609		Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
610		fmOpenReadWrite);
611		Fraw_file.Seek(raw_info.RawAddr, soFromBeginning);
612	<	Fraw_file.CopyFrom(Src, raw_info.RawSize);
612	>	Fraw_file.CopyFrom(Src, Min(raw_info.RawSize, Src.Size));
613		if UnloadWhenUnused then
614		begin
615		FRawOpened := False;
#	Line 576 | Line 654 | begin
654		end;
655		end;
656
657	+
658		procedure TAccess_OniArchive.UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TStream);
659		var
660		raw_info: TRawDataInfo;
#	Line 617 | Line 696 | begin
696		end;
697
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 LocSep then
704		begin
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.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		begin
717		FRawOpened := False;
#	Line 639 | Line 725 | begin
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.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		begin
737		FSepOpened := False;

Diff Legend

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