Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-25 20:18:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Endian neutrality.

Browse source 
svn path=/trunk/; revision=22423
This commit is contained in:
Art Yerkes 2006-06-19 16:38:27 +00:00
parent a63d7b03cf
commit b8bbec3796
1 changed files with 58 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
reactos/tools/pefixup.c
View file

@ -32,7 +32,7 @@
/* The following definitions are ripped from MinGW W32API headers. We don't
use these headers directly in order to allow compilation on Linux hosts. */
typedef unsigned char BYTE;
typedef unsigned char BYTE, *PBYTE;
typedef unsigned short WORD;
typedef unsigned int DWORD;
typedef int LONG;
@ -163,21 +163,50 @@ unsigned char *buffer;
PIMAGE_DOS_HEADER dos_header;
PIMAGE_NT_HEADERS nt_header;
static inline WORD dtohs(WORD in)
{
PBYTE in_ptr = (PBYTE)∈
return in_ptr[0] | (in_ptr[1] << 8);
}
static inline WORD htods(WORD in)
{
WORD out;
PBYTE out_ptr = (PBYTE)&out;
out_ptr[0] = in; out_ptr[1] = in >> 8;
return out;
}
static inline DWORD dtohl(DWORD in)
{
PBYTE in_ptr = (PBYTE)&in;
return in_ptr[0] | (in_ptr[1] << 8) | (in_ptr[2] << 16) | (in_ptr[3] << 24);
}
static inline DWORD htodl(DWORD in)
{
DWORD out;
PBYTE out_ptr = (PBYTE)&out;
out_ptr[0] = in ; out_ptr[1] = in >> 8;
out_ptr[2] = in >> 16; out_ptr[3] = in >> 24;
return out;
}
void *rva_to_ptr(DWORD rva)
{
PIMAGE_SECTION_HEADER section_header;
unsigned int i;
for (i = 0, section_header = IMAGE_FIRST_SECTION(nt_header);
i < nt_header->OptionalHeader.NumberOfRvaAndSizes;
i < dtohl(nt_header->OptionalHeader.NumberOfRvaAndSizes);
i++, section_header++)
{
if (rva >= section_header->VirtualAddress &&
rva < section_header->VirtualAddress +
section_header->Misc.VirtualSize)
if (rva >= dtohl(section_header->VirtualAddress) &&
rva < dtohl(section_header->VirtualAddress) +
dtohl(section_header->Misc.VirtualSize))
{
return buffer + rva - section_header->VirtualAddress +
section_header->PointerToRawData;
return buffer + rva - dtohl(section_header->VirtualAddress) +
dtohl(section_header->PointerToRawData);
}
}
@ -277,12 +306,12 @@ int main(int argc, char **argv)
*/
dos_header = (PIMAGE_DOS_HEADER)buffer;
nt_header = (PIMAGE_NT_HEADERS)(buffer + dos_header->e_lfanew);
nt_header = (PIMAGE_NT_HEADERS)(buffer + dtohl(dos_header->e_lfanew));
if (dos_header->e_magic != IMAGE_DOS_SIGNATURE ||
nt_header->Signature != IMAGE_NT_SIGNATURE)
if (dtohs(dos_header->e_magic) != IMAGE_DOS_SIGNATURE ||
dtohl(nt_header->Signature) != IMAGE_NT_SIGNATURE)
{
printf("'%s' isn't a PE image (headers %x,%x)\n", argv[1], dos_header->e_magic, nt_header->Signature);
printf("'%s' isn't a PE image (bad headers)\n", argv[1]);
free(buffer);
return 1;
}
@ -291,17 +320,17 @@ int main(int argc, char **argv)
{
/* Sort export directory */
data_dir = &nt_header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT];
if (data_dir->Size != 0)
if (dtohl(data_dir->Size) != 0)
{
PIMAGE_EXPORT_DIRECTORY export_directory;
DWORD *name_ptr;
WORD *ordinal_ptr;
export_t *exports;
export_directory = (PIMAGE_EXPORT_DIRECTORY)rva_to_ptr(data_dir->VirtualAddress);
export_directory = (PIMAGE_EXPORT_DIRECTORY)rva_to_ptr(dtohl(data_dir->VirtualAddress));
if (export_directory != NULL)
{
exports = malloc(sizeof(export_t) * export_directory->NumberOfNames);
exports = malloc(sizeof(export_t) * dtohl(export_directory->NumberOfNames));
if (exports == NULL)
{
printf("Not enough memory.\n");
@ -309,22 +338,22 @@ int main(int argc, char **argv)
return 1;
}
name_ptr = (DWORD *)rva_to_ptr(export_directory->AddressOfNames);
ordinal_ptr = (WORD *)rva_to_ptr(export_directory->AddressOfNameOrdinals);
name_ptr = (DWORD *)rva_to_ptr(dtohl(export_directory->AddressOfNames));
ordinal_ptr = (WORD *)rva_to_ptr(dtohl(export_directory->AddressOfNameOrdinals));
for (i = 0; i < export_directory->NumberOfNames; i++)
for (i = 0; i < dtohl(export_directory->NumberOfNames); i++)
{
exports[i].name = name_ptr[i];
exports[i].ordinal = ordinal_ptr[i];
exports[i].name = dtohl(name_ptr[i]);
exports[i].ordinal = dtohl(ordinal_ptr[i]);
}
qsort(exports, export_directory->NumberOfNames, sizeof(export_t),
qsort(exports, dtohl(export_directory->NumberOfNames), sizeof(export_t),
export_compare_func);
for (i = 0; i < export_directory->NumberOfNames; i++)
for (i = 0; i < dtohl(export_directory->NumberOfNames); i++)
{
name_ptr[i] = exports[i].name;
ordinal_ptr[i] = exports[i].ordinal;
name_ptr[i] = htodl(exports[i].name);
ordinal_ptr[i] = htodl(exports[i].ordinal);
}
free(exports);
@ -336,7 +365,7 @@ int main(int argc, char **argv)
{
/* Update section flags */
for (i = 0, section_header = IMAGE_FIRST_SECTION(nt_header);
i < nt_header->OptionalHeader.NumberOfRvaAndSizes;
i < dtohl(nt_header->OptionalHeader.NumberOfRvaAndSizes);
i++, section_header++)
{
if (!strcmp((char*)section_header->Name, ".text") ||
@ -344,16 +373,16 @@ int main(int argc, char **argv)
!strcmp((char*)section_header->Name, ".idata") ||
!strcmp((char*)section_header->Name, ".bss"))
{
section_header->Characteristics |= IMAGE_SCN_MEM_NOT_PAGED;
section_header->Characteristics &= ~IMAGE_SCN_MEM_DISCARDABLE;
section_header->Characteristics |= htodl(IMAGE_SCN_MEM_NOT_PAGED);
section_header->Characteristics &= htodl(~IMAGE_SCN_MEM_DISCARDABLE);
}
else if (!strcmp((char*)section_header->Name, "INIT"))
{
section_header->Characteristics |= IMAGE_SCN_MEM_DISCARDABLE;
section_header->Characteristics |= htodl(IMAGE_SCN_MEM_DISCARDABLE);
}
else if (!strcmp((char*)section_header->Name, "PAGE"))
{
section_header->Characteristics |= IMAGE_SCN_MEM_NOT_PAGED;
section_header->Characteristics |= htodl(IMAGE_SCN_MEM_NOT_PAGED);
}
}
}
@ -367,7 +396,7 @@ int main(int argc, char **argv)
checksum = (checksum + (checksum >> 16)) & 0xffff;
}
checksum += len;
nt_header->OptionalHeader.CheckSum = checksum;
nt_header->OptionalHeader.CheckSum = htods(checksum);
/* Write the output file */
fd_out = open(argv[1], O_WRONLY | O_BINARY);