xemacs-beta: src/unexnt.c comparison

comparison src/unexnt.c @ 209:41ff10fd062f r20-4b3

Import from CVS: tag r20-4b3

author	cvs
date	Mon, 13 Aug 2007 10:04:58 +0200
parents	15872534500d
children	c42ec1d1cded

comparison

equal deleted inserted replaced

-:f427b8ec4379
+:41ff10fd062f
 extern BOOL ctrl_c_handler (unsigned long type);
 #endif
 #include "ntheap.h"
-/* A convenient type for keeping all the info about a mapped file together.  */
+/* Sync with FSF Emacs 19.34.6 note: struct file_data is now defined in ntheap.h */
-typedef struct file_data {
-char          *name;
-unsigned long  size;
-HANDLE         file;
-HANDLE         file_mapping;
-unsigned char *file_base;
-} file_data;
 enum {
 HEAP_UNINITIALIZED = 1,
 HEAP_UNLOADED,
 HEAP_LOADED
 /* Basically, our "initialized" flag.  */
 int heap_state = HEAP_UNINITIALIZED;
 /* So we can find our heap in the file to recreate it.  */
 unsigned long heap_index_in_executable = UNINIT_LONG;
-void open_input_file (file_data *p_file, char *name);
-void open_output_file (file_data *p_file, char *name, unsigned long size);
-void close_file_data (file_data *p_file);
 void get_section_info (file_data *p_file);
 void copy_executable_and_dump_data_section (file_data *, file_data *);
 void dump_bss_and_heap (file_data *p_infile, file_data *p_outfile);
 /* We need to round off our heap to NT's allocation unit (64KB).  */
 round_heap (get_allocation_unit ());
 /* Open the undumped executable file.  */
-open_input_file (&in_file, in_filename);
+if (!open_input_file (&in_file, in_filename))
+{
+printf ("Failed to open %s (%d)...bailing.\n",
+	      in_filename, GetLastError ());
+exit (1);
+}
 /* Get the interesting section info, like start and size of .bss...  */
 get_section_info (&in_file);
 /* The size of the dumped executable is the size of the original
 executable plus the size of the heap and the size of the .bss section.  */
 heap_index_in_executable = (unsigned long)
 round_to_next ((unsigned char *) in_file.size, get_allocation_unit ());
 size = heap_index_in_executable + get_committed_heap_size () + bss_size;
-open_output_file (&out_file, out_filename, size);
+if (!open_output_file (&out_file, out_filename, size))
+{
+printf ("Failed to open %s (%d)...bailing.\n",
+	      out_filename, GetLastError ());
+exit (1);
+}
 /* Set the flag (before dumping).  */
 heap_state = HEAP_UNLOADED;
 copy_executable_and_dump_data_section (&in_file, &out_file);
 /* File handling.  */
-void
+int
 open_input_file (file_data *p_file, char *filename)
 {
 HANDLE file;
 HANDLE file_mapping;
 void  *file_base;
 unsigned long size, upper_size;
 file = CreateFile (filename, GENERIC_READ, FILE_SHARE_READ, NULL,
 		     OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
 if (file == INVALID_HANDLE_VALUE)
-{
+return FALSE;
-	printf ("Failed to open %s (%d)...bailing.\n",
-	       filename, GetLastError ());
-	exit (1);
-}
 size = GetFileSize (file, &upper_size);
 file_mapping = CreateFileMapping (file, NULL, PAGE_READONLY,
 				    0, size, NULL);
 if (!file_mapping)
-{
+return FALSE;
-printf ("Failed to create file mapping of %s (%d)...bailing.\n",
-	     filename, GetLastError ());
-exit (1);
-}
 file_base = MapViewOfFile (file_mapping, FILE_MAP_READ, 0, 0, size);
 if (file_base == 0)
-{
+return FALSE;
-printf ("Failed to map view of file of %s (%d)...bailing.\n",
-	     filename, GetLastError ());
-exit (1);
-}
 p_file->name = filename;
 p_file->size = size;
 p_file->file = file;
 p_file->file_mapping = file_mapping;
 p_file->file_base = file_base;
-}
+return TRUE;
-void
+}
+int
 open_output_file (file_data *p_file, char *filename, unsigned long size)
 {
 HANDLE file;
 HANDLE file_mapping;
 void  *file_base;
-int    i;
 file = CreateFile (filename, GENERIC_READ | GENERIC_WRITE, 0, NULL,
 		     CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
 if (file == INVALID_HANDLE_VALUE)
-{
+return FALSE;
-i = GetLastError ();
-printf ("open_output_file: Failed to open %s (%d).\n",
-	     filename, i);
-exit (1);
-}
 file_mapping = CreateFileMapping (file, NULL, PAGE_READWRITE,
 				    0, size, NULL);
 if (!file_mapping)
-{
+return FALSE;
-i = GetLastError ();
-printf ("open_output_file: Failed to create file mapping of %s (%d).\n",
-	     filename, i);
-exit (1);
-}
 file_base = MapViewOfFile (file_mapping, FILE_MAP_WRITE, 0, 0, size);
 if (file_base == 0)
-{
+return FALSE;
-i = GetLastError ();
-printf ("open_output_file: Failed to map view of file of %s (%d).\n",
-	     filename, i);
-exit (1);
-}
 p_file->name = filename;
 p_file->size = size;
 p_file->file = file;
 p_file->file_mapping = file_mapping;
 p_file->file_base = file_base;
+return TRUE;
 }
 /* Close the system structures associated with the given file.  */
-static void
+void
 close_file_data (file_data *p_file)
 {
 UnmapViewOfFile (p_file->file_base);
 CloseHandle (p_file->file_mapping);
 CloseHandle (p_file->file);
 	}
 break;
 }
 *p_bss_start = (PUCHAR) start;
 *p_bss_size = (DWORD) len;
+}
+/* Return pointer to section header for named section. */
+IMAGE_SECTION_HEADER *
+find_section (char * name, IMAGE_NT_HEADERS * nt_header)
+{
+PIMAGE_SECTION_HEADER section;
+int i;
+section = IMAGE_FIRST_SECTION (nt_header);
+for (i = 0; i < nt_header->FileHeader.NumberOfSections; i++)
+{
+if (strcmp (section->Name, name) == 0)
+	return section;
+section++;
+}
+return NULL;
+}
+/* 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)
+{
+PIMAGE_SECTION_HEADER section;
+int i;
+section = IMAGE_FIRST_SECTION (nt_header);
+for (i = 0; i < nt_header->FileHeader.NumberOfSections; i++)
+{
+if (rva >= section->VirtualAddress &&
+	  rva < section->VirtualAddress + section->SizeOfRawData)
+	return section;
+section++;
+}
+return NULL;
 }
 static unsigned long
 get_section_size (PIMAGE_SECTION_HEADER p_section)
 {

Mercurial > hg > xemacs-beta

comparison src/unexnt.c @ 209:41ff10fd062f r20-4b3