Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-12 22:02:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rsym a bit, so that it properly calculates the section start. Now reactos boots again.

Browse source 
svn path=/branches/ros-amd64-bringup/; revision=38947
This commit is contained in:
Timo Kreuzer 2009-01-19 18:05:27 +00:00
parent 4915884a37
commit 03c5f702be
1 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
reactos/tools/rsym/rsym64.c
View file

@ -723,7 +723,7 @@ ParsePEHeaders(PFILE_INFO File)
{
DWORD OldChecksum, Checksum;
ULONG Alignment, CurrentPos;
int i;
int i, j;
/* Check if MZ header exists */
File->DosHeader = (PIMAGE_DOS_HEADER)File->FilePtr;
@ -786,8 +786,6 @@ ParsePEHeaders(PFILE_INFO File)
File->NewSectionHeaders = malloc((File->AllSections+2) * sizeof(IMAGE_SECTION_HEADER));
File->UsedSections = 0;
File->eh_frame.idx = -1;
CurrentPos = File->SectionHeaders[0].PointerToRawData;
// CurrentPos = ROUND_UP(File->HeaderSize, Alignment);
/* Allocate array of chars, specifiying wheter to copy the section */
File->UseSection = malloc(File->AllSections);
@ -814,26 +812,37 @@ ParsePEHeaders(PFILE_INFO File)
File->eh_frame.idx = i;
File->eh_frame.p = File->FilePtr + File->eh_frame.psh->PointerToRawData;
}
/* Increase number of used sections */
if (File->UseSection[i])
{
/* Copy section header */
File->NewSectionHeaders[File->UsedSections] =
File->SectionHeaders[i];
/* Fix Offset into File */
File->NewSectionHeaders[File->UsedSections].PointerToRawData =
File->SectionHeaders[i].PointerToRawData ? CurrentPos : 0;
CurrentPos += File->NewSectionHeaders[File->UsedSections].SizeOfRawData;
/* Increase number of used sections */
File->UsedSections++;
}
}
/* This is the actual size of the new section headers */
File->NewSectionHeaderSize =
(File->UsedSections+2) * sizeof(IMAGE_SECTION_HEADER);
/* Calculate the position to start writing the sections to */
CurrentPos = File->HeaderSize + File->NewSectionHeaderSize;
CurrentPos = ROUND_UP(CurrentPos, Alignment);
/* Create new section headers */
for (i = 0, j = 0; i < File->AllSections; i++)
{
if (File->UseSection[i])
{
/* Copy section header */
File->NewSectionHeaders[j] =
File->SectionHeaders[i];
/* Fix Offset into File */
File->NewSectionHeaders[j].PointerToRawData =
File->SectionHeaders[i].PointerToRawData ? CurrentPos : 0;
CurrentPos += File->NewSectionHeaders[j].SizeOfRawData;
j++;
}
}
if (File->eh_frame.idx == -1)
{
fprintf(stderr, "No .eh_frame section found\n");