paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-11 18:25:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ calculate the table offset of each string in the NewExe imported name table

Browse Source 
git-svn-id: trunk@42613 -
This commit is contained in:
nickysn 2019-08-09 13:49:36 +00:00
parent d24cfcb31c
commit deefeb1ca0
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
compiler/ogomf.pas
View File

@ -510,6 +510,10 @@ interface
{ TNewExeImportedNameTableEntry } { TNewExeImportedNameTableEntry }
TNewExeImportedNameTableEntry = class(TFPHashObject) TNewExeImportedNameTableEntry = class(TFPHashObject)
private
FTableOffset: Word;
public
property TableOffset: Word read FTableOffset write FTableOffset;
end; end;
{ TNewExeImportedNameTable } { TNewExeImportedNameTable }
@ -519,6 +523,7 @@ interface
function GetSize: QWord; function GetSize: QWord;
public public
procedure AddImportedName(const name:TSymStr); procedure AddImportedName(const name:TSymStr);
procedure CalcTableOffsets;
procedure WriteTo(aWriter: TObjectWriter); procedure WriteTo(aWriter: TObjectWriter);
property Size: QWord read GetSize; property Size: QWord read GetSize;
end; end;
@ -3777,6 +3782,24 @@ cleanup:
TNewExeImportedNameTableEntry.Create(Self,name); TNewExeImportedNameTableEntry.Create(Self,name);
end; end;
procedure TNewExeImportedNameTable.CalcTableOffsets;
var
cofs: LongInt;
i: Integer;
entry: TNewExeImportedNameTableEntry;
begin
{ the table starts with an empty entry, which takes 1 byte }
cofs:=1;
for i:=0 to Count-1 do
begin
entry:=TNewExeImportedNameTableEntry(Items[i]);
entry.TableOffset:=cofs;
Inc(cofs,1+Length(entry.Name));
if cofs>High(Word) then
internalerror(2019080902);
end;
end;
procedure TNewExeImportedNameTable.WriteTo(aWriter: TObjectWriter); procedure TNewExeImportedNameTable.WriteTo(aWriter: TObjectWriter);
var var
i: Integer; i: Integer;
@ -3948,6 +3971,7 @@ cleanup:
TNewExeResidentNameTableEntry.Create(ResidentNameTable,ExtractModuleName(current_module.exefilename),0); TNewExeResidentNameTableEntry.Create(ResidentNameTable,ExtractModuleName(current_module.exefilename),0);
FillImportedNameTable; FillImportedNameTable;
ImportedNameTable.CalcTableOffsets;
Header.InitialIP:=EntrySym.address; Header.InitialIP:=EntrySym.address;
Header.InitialCS:=TNewExeSection(EntrySym.objsection.ExeSection).MemBasePos; Header.InitialCS:=TNewExeSection(EntrySym.objsection.ExeSection).MemBasePos;