diff options
Diffstat (limited to 'nt/preprep.c')
| -rw-r--r-- | nt/preprep.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/nt/preprep.c b/nt/preprep.c index 08a29ae5931..64cd1b73916 100644 --- a/nt/preprep.c +++ b/nt/preprep.c @@ -67,17 +67,17 @@ open_input_file (file_data *p_file, char *filename) file = CreateFile (filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); - if (file == INVALID_HANDLE_VALUE) + if (file == INVALID_HANDLE_VALUE) return FALSE; size = GetFileSize (file, &upper_size); - file_mapping = CreateFileMapping (file, NULL, PAGE_READONLY, + file_mapping = CreateFileMapping (file, NULL, PAGE_READONLY, 0, size, NULL); - if (!file_mapping) + if (!file_mapping) return FALSE; file_base = MapViewOfFile (file_mapping, FILE_MAP_READ, 0, 0, size); - if (file_base == 0) + if (file_base == 0) return FALSE; p_file->name = filename; @@ -98,18 +98,18 @@ open_output_file (file_data *p_file, char *filename, unsigned long size) file = CreateFile (filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - if (file == INVALID_HANDLE_VALUE) + if (file == INVALID_HANDLE_VALUE) return FALSE; - file_mapping = CreateFileMapping (file, NULL, PAGE_READWRITE, + file_mapping = CreateFileMapping (file, NULL, PAGE_READWRITE, 0, size, NULL); - if (!file_mapping) + if (!file_mapping) return FALSE; - + file_base = MapViewOfFile (file_mapping, FILE_MAP_WRITE, 0, 0, size); - if (file_base == 0) + if (file_base == 0) return FALSE; - + p_file->name = filename; p_file->size = size; p_file->file = file; @@ -129,17 +129,17 @@ open_inout_file (file_data *p_file, char *filename) file = CreateFile (filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); - if (file == INVALID_HANDLE_VALUE) + if (file == INVALID_HANDLE_VALUE) return FALSE; size = GetFileSize (file, &upper_size); file_mapping = CreateFileMapping (file, NULL, PAGE_READWRITE, 0, size, NULL); - if (!file_mapping) + if (!file_mapping) return FALSE; file_base = MapViewOfFile (file_mapping, FILE_MAP_WRITE, 0, 0, size); - if (file_base == 0) + if (file_base == 0) return FALSE; p_file->name = filename; @@ -341,7 +341,7 @@ relocate_offset (DWORD offset, easy to parse. */ static void -copy_executable_and_move_sections (file_data *p_infile, +copy_executable_and_move_sections (file_data *p_infile, file_data *p_outfile) { unsigned char *dst; @@ -389,10 +389,10 @@ copy_executable_and_move_sections (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 long) dos_header) + dos_header->e_lfanew); section = IMAGE_FIRST_SECTION (nt_header); - + import_dir = &nt_header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT]; import_section = rva_to_section (import_dir->VirtualAddress, nt_header); @@ -776,7 +776,7 @@ main (int argc, char **argv) /* Open the original (dumped) executable file for reference. */ if (!open_input_file (&in_file, in_filename)) { - printf ("Failed to open %s (%d)...bailing.\n", + printf ("Failed to open %s (%d)...bailing.\n", in_filename, GetLastError ()); exit (1); } @@ -786,7 +786,7 @@ main (int argc, char **argv) which should fit in the alignment slop. */ if (!open_output_file (&out_file, out_filename, in_file.size)) { - printf ("Failed to open %s (%d)...bailing.\n", + printf ("Failed to open %s (%d)...bailing.\n", out_filename, GetLastError ()); exit (1); } |