ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/oup/current/Tools/BinEdit.pas

Comparing:
oup/rewrite/Tools/BinEdit.pas (file contents), Revision 104 by alloc, Tue Feb 20 22:03:11 2007 UTC vs.
oup/current/Tools/BinEdit.pas (file contents), Revision 198 by alloc, Sat May 26 19:28:08 2007 UTC

#	Line 21 | Line 21 | type
21		value_viewer_context_copyasstring: TMenuItem;
22		value_viewer_context_copyashex: TMenuItem;
23		VTHPopup: TVTHeaderPopupMenu;
24	+	panel_imexport: TPanel;
25	+	btn_export: TButton;
26	+	btn_import: TButton;
27		procedure FormCreate(Sender: TObject);
28		procedure NewFile(fileinfo: TFileInfo);
29
#	Line 33 | Line 36 | type
36
37		procedure LoadDat(_fileid: Integer);
38		function Save: Boolean;
39	<	function GetValue(datatype: Word; offset: LongWord): String;
40	<	procedure SetNewValue(datatype: Word; offset: LongWord; Value: String);
39	>	function GetValue(datatype: Word; offset: Integer): String;
40	>	procedure SetNewValue(datatype: Word; offset: Integer; Value: String);
41
42		procedure WriteStructureInfos;
43		procedure ClearStructViewer;
#	Line 58 | Line 61 | type
61		private
62		fileid: Integer;
63		ConID: Integer;
64	+	rawlist: TRawDataList;
65		public
66		end;
67
#	Line 66 | Line 70 | var
70
71		implementation
72
73	<	uses ValueEdit, Main, Functions, DatStructureLoader{, RawEdit};
73	>	uses ValueEdit, Main, Functions, DatStructureLoader, RawEdit;
74		{$R *.dfm}
75
76		type
#	Line 139 | Line 143 | end;
143		procedure TForm_BinEdit.LoadDat(_fileid: Integer);
144		var
145		mem:  TMemoryStream;
142	–	Data: TByteData;
146		begin
147		if ConID <> -1 then
148		begin
#	Line 161 | Line 164 | begin
164		Self.ClearStructViewer;
165		mem := nil;
166		ConManager.Connection[ConID].LoadDatFile(fileid, TStream(mem));
167	+	rawlist := ConManager.Connection[ConID].GetRawList(fileid);
168		hex.LoadFromStream(mem);
169		mem.Free;
170		ClearValues;
#	Line 173 | Line 177 | begin
177		Self.ClearStructViewer;
178		ClearValues;
179		hex.DataSize := 0;
180	+	SetLength(rawlist, 0);
181		end;
182		end;
183
184
185
186	<
182	<	function IntToBin(Value: Byte): String;
183	<	var
184	<	i: Byte;
185	<	begin
186	<	Result := '';
187	<	for i := 7 downto 0 do
188	<	Result := Result + IntToStr((Value shr i) and $01);
189	<	end;
190	<
191	<
192	<
193	<
194	<	function TForm_BinEdit.GetValue(datatype: Word; offset: LongWord): String;
186	>	function TForm_BinEdit.GetValue(datatype: Word; offset: Integer): String;
187		var
188		Data: TByteData;
189	<	i:    Word;
189	>	i:    Integer;
190	>	tempi: Integer;
191		floatformat: TFormatSettings;
192		begin
193		floatformat.DecimalSeparator := '.';
#	Line 230 | Line 223 | begin
223		10:
224		Result := IntToBin(hex.Data[offset]);
225		11:
226	<	Result := '0x' + IntToHex(ConManager.Connection[ConID].GetRawInfo(fileid, offset).RawAddr, 8);
226	>	begin
227	>	if Length(rawlist) > 0 then
228	>	begin
229	>	for i := 0 to High(rawlist) do
230	>	if rawlist[i].SrcOffset = offset then
231	>	begin
232	>	if rawlist[i].RawAddr > 0 then
233	>	Result := '0x' + IntToHex(rawlist[i].RawAddr, 8)
234	>	else
235	>	Result := 'unused';
236	>	Break;
237	>	end;
238	>	if i > High(rawlist) then
239	>	Result := 'unused';
240	>	end;
241	>	end;
242		12:
243	<	Result := FormatNumber(hex.Data[offset + 1] + hex.Data[offset + 2] * 256 +
244	<	hex.Data[offset + 3] * 256 * 256, 5, '0');
243	>	if hex.Data[offset] = 1 then
244	>	Result := FormatNumber(hex.Data[offset + 1] + hex.Data[offset + 2] * 256 +
245	>	hex.Data[offset + 3] * 256 * 256, 5, '0')
246	>	else
247	>	Result := 'no link';
248		13:
249		Result := IntToStr(hex.Data[offset]);
250		14:
#	Line 286 | Line 297 | end;
297
298		procedure TForm_BinEdit.WriteStructureInfos;
299		var
300	<	i, j:    LongWord;
300	>	i, j:    Integer;
301		pdata:   PNodeData;
302		Data:    TNodeData;
303		node:    PVirtualNode;
#	Line 320 | Line 331 | begin
331		begin
332		if Pos('#', SubName) > 0 then
333		begin
334	<	Data.Offset  := HexToLong(MidStr(SubName, Pos('#', SubName) + 1, 8));
335	<	Data.Value   :=
334	>	Data.Offset  := StrToInt('$'+MidStr(SubName, Pos('#', SubName) + 1, 8));
335	>	Data.Value   := '$' +
336		MidStr(SubName, PosEx('#', SubName, Pos('#', SubName) + 1) + 1, 8);
337		Data.Caption := MidStr(SubName, 1, Pos('#', SubName) - 1);
338		Data.Description := SubDesc;
#	Line 388 | Line 399 | var
399		i, j:  Integer;
400		Data:  TByteData;
401		str:   String;
402	<	Value: LongWord;
402	>	Value: Integer;
403		floatformat: TFormatSettings;
404		begin
405		floatformat.DecimalSeparator := '.';
#	Line 471 | Line 482 | begin
482		str := '';
483		if hex.SelCount = 0 then
484		begin
485	<	while (hex.Data[hex.SelStart + j] > 0) and ((hex.SelStart + j) < hex.DataSize) do
485	>	while (hex.SelStart + j) < hex.DataSize do
486		begin
487	+	if hex.Data[hex.SelStart + j] = 0 then
488	+	Break;
489		if hex.Data[hex.selstart + j] >= 32 then
490		str := str + Char(hex.Data[hex.SelStart + j])
491		else
#	Line 501 | Line 514 | end;
514		function TForm_BinEdit.Save: Boolean;
515		var
516		mem:  TMemoryStream;
517	<	i:    LongWord;
517	>	i:    Integer;
518		begin
519		case MessageBox(Self.Handle, PChar('Save changes to file ' +
520		ConManager.Connection[ConID].GetFileInfo(fileid).Name + '?'), PChar('Data changed...'),
#	Line 683 | Line 696 | end;
696		procedure TForm_BinEdit.value_viewer_context_copyClick(Sender: TObject);
697		var
698		Name:  String;
699	<	Value: LongWord;
699	>	Value: Integer;
700		begin
701		Name := TMenuItem(Sender).Name;
702		if Pos('asstring', Name) > 0 then
#	Line 746 | Line 759 | procedure TForm_BinEdit.VSTDblClick(Send
759		var
760		node: PVirtualNode;
761		nodedata: PNodeData;
762	+	rawinfo: TRawDataInfo;
763		form: TForm_ToolTemplate;
764		begin
765		if VST.FocusedColumn = 3 then
#	Line 761 | Line 775 | begin
775		end
776		else
777		begin
778	<	if nodedata.DataType = 11 then
778	>	if (nodedata.DataType = 11) and (nodedata.Value <> 'unused') then
779		begin
780	<	if ConManager.Connection[ConID].GetRawInfo(fileid, nodedata.offset).RawSize > 0 then
781	<	Form_Main.open_child('rawedit', ConID, fileid);
780	>	rawinfo := ConManager.Connection[ConID].GetRawInfo(fileid, nodedata.offset);
781	>	if rawinfo.RawSize > 0 then
782	>	begin
783	>	form := nil;
784	>	form := Form_Main.open_child('rawedit', ConID, fileid);
785	>	if Assigned(form) then
786	>	TForm_RawEdit(form).LoadRaw(rawinfo);
787	>	end;
788		end;
789	<	if nodedata.DataType = 12 then
789	>	if (nodedata.DataType = 12) and (nodedata.Value <> 'no link') then
790		begin
791		if (StrToInt(nodedata.Value) < ConManager.Connection[ConID].GetFileCount) and
792		(StrToInt(nodedata.Value) > 0) and
#	Line 806 | Line 826 | begin
826		else
827		begin
828		hex.SelStart := Data.Offset;
829	<	hex.SelEnd   := Data.Offset + HexToLong(Data.Value) - 1;
829	>	hex.SelEnd   := Data.Offset + StrToInt(Data.Value) - 1;
830		end;
831		end;
832
#	Line 837 | Line 857 | begin
857		if Data.DataType > 0 then
858		CellText := Data.Value //GetValue(data.DataType, data.Offset)
859		else if Length(Data.Value) > 0 then
860	<	CellText := IntToStr(HexToLong(Data.Value)) + ' Bytes';
860	>	CellText := IntToStr(StrToInt(Data.Value)) + ' Bytes';
861		4:
862		CellText := Data.Description;
863		end;
#	Line 868 | Line 888 | end;
888
889
890
891	<	procedure TForm_BinEdit.SetNewValue(datatype: Word; offset: LongWord; Value: String);
891	>	procedure TForm_BinEdit.SetNewValue(datatype: Word; offset: Integer; Value: String);
892		var
893		Data: TByteData;
894		value_int: LongWord;
#	Line 935 | Line 955 | end;
955
956		procedure TForm_BinEdit.value_viewerDblClick(Sender: TObject);
957		var
958	<	offset:     LongWord;
958	>	offset:     Integer;
959		datatype:   Word;
960		objectname: String;
961		Value:      String;

Diff Legend

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