X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ecae6af979abcbb5b45c33ee05ceb297678ec9a0..88c4a13c3b573e0fa844c88ab89765ef308c267e:/nt/addsection.c diff --git a/nt/addsection.c b/nt/addsection.c index 240286fc01..d720dec428 100644 --- a/nt/addsection.c +++ b/nt/addsection.c @@ -1,6 +1,5 @@ /* Add an uninitialized data section to an executable. - Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008 Free Software Foundation, Inc. + Copyright (C) 1999, 2001-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -36,10 +35,10 @@ along with GNU Emacs. If not, see . in \\win32sdk\mstools\samples\image\include\imagehlp.h. */ PIMAGE_NT_HEADERS -(__stdcall * pfnCheckSumMappedFile) (LPVOID BaseAddress, - DWORD FileLength, - LPDWORD HeaderSum, - LPDWORD CheckSum); +(__stdcall * pfnCheckSumMappedFile) (PVOID BaseAddress, + DWORD_PTR FileLength, + PDWORD_PTR HeaderSum, + PDWORD_PTR CheckSum); #undef min #undef max @@ -50,15 +49,15 @@ PIMAGE_NT_HEADERS /* File handling. */ typedef struct file_data { - char *name; - unsigned long size; - HANDLE file; - HANDLE file_mapping; - unsigned char *file_base; + const char *name; + unsigned long size; + HANDLE file; + HANDLE file_mapping; + unsigned char *file_base; } file_data; int -open_input_file (file_data *p_file, char *filename) +open_input_file (file_data *p_file, const char *filename) { HANDLE file; HANDLE file_mapping; @@ -90,7 +89,7 @@ open_input_file (file_data *p_file, char *filename) } int -open_output_file (file_data *p_file, char *filename, unsigned long size) +open_output_file (file_data *p_file, const char *filename, unsigned long size) { HANDLE file; HANDLE file_mapping; @@ -146,7 +145,7 @@ get_unrounded_section_size (PIMAGE_SECTION_HEADER p_section) /* Return pointer to section header for named section. */ IMAGE_SECTION_HEADER * -find_section (char * name, IMAGE_NT_HEADERS * nt_header) +find_section (const char *name, IMAGE_NT_HEADERS *nt_header) { PIMAGE_SECTION_HEADER section; int i; @@ -165,7 +164,7 @@ find_section (char * name, IMAGE_NT_HEADERS * nt_header) /* Return pointer to section header for section containing the given relative virtual address. */ IMAGE_SECTION_HEADER * -rva_to_section (DWORD rva, IMAGE_NT_HEADERS * nt_header) +rva_to_section (DWORD_PTR rva, IMAGE_NT_HEADERS * nt_header) { PIMAGE_SECTION_HEADER section; int i; @@ -180,7 +179,7 @@ rva_to_section (DWORD rva, IMAGE_NT_HEADERS * nt_header) some very old exes (eg. gzip dated Dec 1993). Since w32_executable_type relies on this function to work reliably, we need to cope with this. */ - DWORD real_size = max (section->SizeOfRawData, + DWORD_PTR real_size = max (section->SizeOfRawData, section->Misc.VirtualSize); if (rva >= section->VirtualAddress && rva < section->VirtualAddress + real_size) @@ -193,7 +192,7 @@ rva_to_section (DWORD rva, IMAGE_NT_HEADERS * nt_header) /* Return pointer to section header for section containing the given offset in its raw data area. */ IMAGE_SECTION_HEADER * -offset_to_section (DWORD offset, IMAGE_NT_HEADERS * nt_header) +offset_to_section (DWORD_PTR offset, IMAGE_NT_HEADERS * nt_header) { PIMAGE_SECTION_HEADER section; int i; @@ -213,8 +212,8 @@ offset_to_section (DWORD offset, IMAGE_NT_HEADERS * nt_header) /* Return offset to an object in dst, given offset in src. We assume there is at least one section in both src and dst images, and that the some sections may have been added to dst (after sections in src). */ -static DWORD -relocate_offset (DWORD offset, +static DWORD_PTR +relocate_offset (DWORD_PTR offset, IMAGE_NT_HEADERS * src_nt_header, IMAGE_NT_HEADERS * dst_nt_header) { @@ -248,32 +247,33 @@ relocate_offset (DWORD offset, } #define OFFSET_TO_RVA(offset, section) \ - (section->VirtualAddress + ((DWORD)(offset) - section->PointerToRawData)) + (section->VirtualAddress + ((DWORD_PTR)(offset) - section->PointerToRawData)) #define RVA_TO_OFFSET(rva, section) \ - (section->PointerToRawData + ((DWORD)(rva) - section->VirtualAddress)) + (section->PointerToRawData + ((DWORD_PTR)(rva) - section->VirtualAddress)) #define RVA_TO_SECTION_OFFSET(rva, section) \ - ((DWORD)(rva) - section->VirtualAddress) + ((DWORD_PTR)(rva) - section->VirtualAddress) /* Convert address in executing image to RVA. */ -#define PTR_TO_RVA(ptr) ((DWORD)(ptr) - (DWORD) GetModuleHandle (NULL)) +#define PTR_TO_RVA(ptr) ((DWORD_PTR)(ptr) - (DWORD_PTR) GetModuleHandle (NULL)) #define PTR_TO_OFFSET(ptr, pfile_data) \ - ((unsigned char *)(ptr) - (pfile_data)->file_base) + ((unsigned const char *)(ptr) - (pfile_data)->file_base) #define OFFSET_TO_PTR(offset, pfile_data) \ - ((pfile_data)->file_base + (DWORD)(offset)) + ((pfile_data)->file_base + (DWORD_PTR)(offset)) -#define ROUND_UP(p, align) (((DWORD)(p) + (align)-1) & ~((align)-1)) -#define ROUND_DOWN(p, align) ((DWORD)(p) & ~((align)-1)) +#define ROUND_UP(p, align) \ + (((DWORD_PTR)(p) + (align)-1) & ~((DWORD_PTR)(align)-1)) +#define ROUND_DOWN(p, align) ((DWORD_PTR)(p) & ~((DWORD_PTR)(align)-1)) static void copy_executable_and_add_section (file_data *p_infile, file_data *p_outfile, - char *new_section_name, - DWORD new_section_size) + const char *new_section_name, + DWORD_PTR new_section_size) { unsigned char *dst; PIMAGE_DOS_HEADER dos_header; @@ -281,13 +281,13 @@ copy_executable_and_add_section (file_data *p_infile, PIMAGE_NT_HEADERS dst_nt_header; PIMAGE_SECTION_HEADER section; PIMAGE_SECTION_HEADER dst_section; - DWORD offset; + DWORD_PTR offset; int i; int be_verbose = GetEnvironmentVariable ("DEBUG_DUMP", NULL, 0) > 0; #define COPY_CHUNK(message, src, size, verbose) \ do { \ - unsigned char *s = (void *)(src); \ + unsigned const char *s = (void *)(src); \ unsigned long count = (size); \ if (verbose) \ { \ @@ -318,17 +318,17 @@ copy_executable_and_add_section (file_data *p_infile, Note that dst is updated implicitly by each COPY_CHUNK. */ dos_header = (PIMAGE_DOS_HEADER) p_infile->file_base; - nt_header = (PIMAGE_NT_HEADERS) (((unsigned long) dos_header) + + nt_header = (PIMAGE_NT_HEADERS) (((unsigned char *) dos_header) + dos_header->e_lfanew); section = IMAGE_FIRST_SECTION (nt_header); dst = (unsigned char *) p_outfile->file_base; COPY_CHUNK ("Copying DOS header...", dos_header, - (DWORD) nt_header - (DWORD) dos_header, be_verbose); + (DWORD_PTR) nt_header - (DWORD_PTR) dos_header, be_verbose); dst_nt_header = (PIMAGE_NT_HEADERS) dst; COPY_CHUNK ("Copying NT header...", nt_header, - (DWORD) section - (DWORD) nt_header, be_verbose); + (DWORD_PTR) section - (DWORD_PTR) nt_header, be_verbose); dst_section = (PIMAGE_SECTION_HEADER) dst; COPY_CHUNK ("Copying section table...", section, nt_header->FileHeader.NumberOfSections * sizeof (*section), @@ -510,8 +510,8 @@ main (int argc, char **argv) /* Patch up header fields; profiler is picky about this. */ { HANDLE hImagehelp = LoadLibrary ("imagehlp.dll"); - DWORD headersum; - DWORD checksum; + DWORD_PTR headersum; + DWORD_PTR checksum; dos_header = (PIMAGE_DOS_HEADER) out_file.file_base; nt_header = (PIMAGE_NT_HEADERS) ((char *) dos_header + dos_header->e_lfanew); @@ -542,5 +542,3 @@ main (int argc, char **argv) /* eof */ -/* arch-tag: 17e2b0aa-8c17-4bd1-b24b-1cda689245fa - (do not change this comment) */