--- oup/rewrite/Tools/BinEdit.pas 2007/02/20 22:03:11 104 +++ oup/current/Tools/BinEdit.pas 2007/05/27 20:03:41 204 @@ -21,6 +21,9 @@ type value_viewer_context_copyasstring: TMenuItem; value_viewer_context_copyashex: TMenuItem; VTHPopup: TVTHeaderPopupMenu; + panel_imexport: TPanel; + btn_export: TButton; + btn_import: TButton; procedure FormCreate(Sender: TObject); procedure NewFile(fileinfo: TFileInfo); @@ -33,8 +36,8 @@ type procedure LoadDat(_fileid: Integer); function Save: Boolean; - function GetValue(datatype: Word; offset: LongWord): String; - procedure SetNewValue(datatype: Word; offset: LongWord; Value: String); + function GetValue(datatype: Word; offset: Integer): String; + procedure SetNewValue(datatype: Word; offset: Integer; Value: String); procedure WriteStructureInfos; procedure ClearStructViewer; @@ -58,6 +61,7 @@ type private fileid: Integer; ConID: Integer; + rawlist: TRawDataList; public end; @@ -66,7 +70,7 @@ var implementation -uses ValueEdit, Main, Functions, DatStructureLoader{, RawEdit}; +uses ValueEdit, Main, Functions, DatStructureLoader, RawEdit; {$R *.dfm} type @@ -139,7 +143,6 @@ end; procedure TForm_BinEdit.LoadDat(_fileid: Integer); var mem: TMemoryStream; - Data: TByteData; begin if ConID <> -1 then begin @@ -161,6 +164,7 @@ begin Self.ClearStructViewer; mem := nil; ConManager.Connection[ConID].LoadDatFile(fileid, TStream(mem)); + rawlist := ConManager.Connection[ConID].GetRawList(fileid); hex.LoadFromStream(mem); mem.Free; ClearValues; @@ -173,28 +177,16 @@ begin Self.ClearStructViewer; ClearValues; hex.DataSize := 0; + SetLength(rawlist, 0); 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; - - - - -function TForm_BinEdit.GetValue(datatype: Word; offset: LongWord): String; +function TForm_BinEdit.GetValue(datatype: Word; offset: Integer): String; var Data: TByteData; - i: Word; + i: Integer; floatformat: TFormatSettings; begin floatformat.DecimalSeparator := '.'; @@ -230,10 +222,28 @@ begin 10: Result := IntToBin(hex.Data[offset]); 11: - Result := '0x' + IntToHex(ConManager.Connection[ConID].GetRawInfo(fileid, offset).RawAddr, 8); + begin + if Length(rawlist) > 0 then + begin + for i := 0 to High(rawlist) do + if rawlist[i].SrcOffset = offset then + begin + if rawlist[i].RawAddr > 0 then + Result := '0x' + IntToHex(rawlist[i].RawAddr, 8) + else + Result := 'unused'; + Break; + end; + if i > High(rawlist) then + Result := 'unused'; + end; + end; 12: - Result := FormatNumber(hex.Data[offset + 1] + hex.Data[offset + 2] * 256 + - hex.Data[offset + 3] * 256 * 256, 5, '0'); + if hex.Data[offset] = 1 then + Result := FormatNumber(hex.Data[offset + 1] + hex.Data[offset + 2] * 256 + + hex.Data[offset + 3] * 256 * 256, 5, '0') + else + Result := 'no link'; 13: Result := IntToStr(hex.Data[offset]); 14: @@ -286,7 +296,7 @@ end; procedure TForm_BinEdit.WriteStructureInfos; var - i, j: LongWord; + i, j: Integer; pdata: PNodeData; Data: TNodeData; node: PVirtualNode; @@ -320,8 +330,8 @@ begin begin if Pos('#', SubName) > 0 then begin - Data.Offset := HexToLong(MidStr(SubName, Pos('#', SubName) + 1, 8)); - Data.Value := + Data.Offset := StrToInt('$'+MidStr(SubName, Pos('#', SubName) + 1, 8)); + Data.Value := '$' + MidStr(SubName, PosEx('#', SubName, Pos('#', SubName) + 1) + 1, 8); Data.Caption := MidStr(SubName, 1, Pos('#', SubName) - 1); Data.Description := SubDesc; @@ -388,7 +398,7 @@ var i, j: Integer; Data: TByteData; str: String; - Value: LongWord; + Value: Integer; floatformat: TFormatSettings; begin floatformat.DecimalSeparator := '.'; @@ -471,8 +481,10 @@ begin str := ''; if hex.SelCount = 0 then begin - while (hex.Data[hex.SelStart + j] > 0) and ((hex.SelStart + j) < hex.DataSize) do + while (hex.SelStart + j) < hex.DataSize do begin + if hex.Data[hex.SelStart + j] = 0 then + Break; if hex.Data[hex.selstart + j] >= 32 then str := str + Char(hex.Data[hex.SelStart + j]) else @@ -501,7 +513,7 @@ end; function TForm_BinEdit.Save: Boolean; var mem: TMemoryStream; - i: LongWord; + i: Integer; begin case MessageBox(Self.Handle, PChar('Save changes to file ' + ConManager.Connection[ConID].GetFileInfo(fileid).Name + '?'), PChar('Data changed...'), @@ -683,7 +695,7 @@ end; procedure TForm_BinEdit.value_viewer_context_copyClick(Sender: TObject); var Name: String; - Value: LongWord; + Value: Integer; begin Name := TMenuItem(Sender).Name; if Pos('asstring', Name) > 0 then @@ -746,6 +758,7 @@ procedure TForm_BinEdit.VSTDblClick(Send var node: PVirtualNode; nodedata: PNodeData; + rawinfo: TRawDataInfo; form: TForm_ToolTemplate; begin if VST.FocusedColumn = 3 then @@ -761,12 +774,18 @@ begin end else begin - if nodedata.DataType = 11 then + if (nodedata.DataType = 11) and (nodedata.Value <> 'unused') then begin - if ConManager.Connection[ConID].GetRawInfo(fileid, nodedata.offset).RawSize > 0 then - Form_Main.open_child('rawedit', ConID, fileid); + rawinfo := ConManager.Connection[ConID].GetRawInfo(fileid, nodedata.offset); + if rawinfo.RawSize > 0 then + begin + form := nil; + form := Form_Main.open_child('rawedit', ConID, fileid); + if Assigned(form) then + TForm_RawEdit(form).LoadRaw(rawinfo); + end; end; - if nodedata.DataType = 12 then + if (nodedata.DataType = 12) and (nodedata.Value <> 'no link') then begin if (StrToInt(nodedata.Value) < ConManager.Connection[ConID].GetFileCount) and (StrToInt(nodedata.Value) > 0) and @@ -806,7 +825,7 @@ begin else begin hex.SelStart := Data.Offset; - hex.SelEnd := Data.Offset + HexToLong(Data.Value) - 1; + hex.SelEnd := Data.Offset + StrToInt(Data.Value) - 1; end; end; @@ -837,7 +856,7 @@ begin if Data.DataType > 0 then CellText := Data.Value //GetValue(data.DataType, data.Offset) else if Length(Data.Value) > 0 then - CellText := IntToStr(HexToLong(Data.Value)) + ' Bytes'; + CellText := IntToStr(StrToInt(Data.Value)) + ' Bytes'; 4: CellText := Data.Description; end; @@ -868,7 +887,7 @@ end; -procedure TForm_BinEdit.SetNewValue(datatype: Word; offset: LongWord; Value: String); +procedure TForm_BinEdit.SetNewValue(datatype: Word; offset: Integer; Value: String); var Data: TByteData; value_int: LongWord; @@ -935,7 +954,7 @@ end; procedure TForm_BinEdit.value_viewerDblClick(Sender: TObject); var - offset: LongWord; + offset: Integer; datatype: Word; objectname: String; Value: String;