(Fy_or_n_p, Fyes_or_no_p): using_x_p renamed to have_menus_p.

[gnu-emacs] / src / unexw32.c

diff --git a/src/unexw32.c b/src/unexw32.c
index cf89f031bb956d2d0fb75a27f56831eddac5df13..7b9712c11c5203eb07c214beb6b3a5b0900d3d03 100644 (file)
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -63,6 +63,30 @@ DWORD  data_size = 0;
 PUCHAR bss_start = 0;
 DWORD  bss_size = 0;
 
+#ifdef HAVE_NTGUI
+HINSTANCE hinst = NULL;
+HINSTANCE hprevinst = NULL;
+LPSTR lpCmdLine = "";
+int nCmdShow = 0;
+    
+int __stdcall 
+WinMain (_hinst, _hPrevInst, _lpCmdLine, _nCmdShow)
+     HINSTANCE _hinst;
+     HINSTANCE _hPrevInst;
+     LPSTR _lpCmdLine;
+     int _nCmdShow;
+{
+  /* Need to parse command line */
+    
+  hinst = _hinst;
+  hprevinst = _hPrevInst;
+  lpCmdLine = _lpCmdLine;
+  nCmdShow = _nCmdShow;
+
+  return (main (__argc,__argv,_environ));
+}
+#endif /* HAVE_NTGUI */
+
 /* Startup code for running on NT.  When we are running as the dumped
    version, we need to bootstrap our heap and .bss section into our
    address space before we can actually hand off control to the startup
@@ -70,7 +94,11 @@ DWORD  bss_size = 0;
 void
 _start (void)
 {
+#ifdef HAVE_NTGUI
+  extern void WinMainCRTStartup (void);
+#else
   extern void mainCRTStartup (void);
+#endif /* HAVE_NTGUI */
 
   /* Cache system info, e.g., the NT page size.  */
   cache_system_info ();
@@ -103,7 +131,11 @@ _start (void)
 
   /* Invoke the NT CRT startup routine now that our housecleaning
      is finished.  */
+#ifdef HAVE_NTGUI
+  WinMainCRTStartup ();
+#else
   mainCRTStartup ();
+#endif /* HAVE_NTGUI */
 }
 
 /* Dump out .data and .bss sections into a new exectubale.  */
@@ -209,13 +241,15 @@ 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) 
     {
+      i = GetLastError ();
       printf ("open_output_file: Failed to open %s (%d).\n", 
-            filename, GetLastError ());
+            filename, i);
       exit (1);
     }
   
@@ -223,16 +257,18 @@ open_output_file (file_data *p_file, char *filename, unsigned long size)
                                    0, size, NULL);
   if (!file_mapping) 
     {
+      i = GetLastError ();
       printf ("open_output_file: Failed to create file mapping of %s (%d).\n",
-            filename, GetLastError ());
+            filename, i);
       exit (1);
     }
   
   file_base = MapViewOfFile (file_mapping, FILE_MAP_WRITE, 0, 0, size);
   if (file_base == 0) 
     {
+      i = GetLastError ();
       printf ("open_output_file: Failed to map view of file of %s (%d).\n",
-            filename, GetLastError ());
+            filename, i);
       exit (1);
     }
   
@@ -255,6 +291,44 @@ close_file_data (file_data *p_file)
 
 /* Routines to manipulate NT executable file sections.  */
 
+static void
+get_bss_info_from_map_file (file_data *p_infile, PUCHAR *p_bss_start, 
+                           DWORD *p_bss_size)
+{
+  int n, start, len;
+  char map_filename[MAX_PATH];
+  char buffer[256];
+  FILE *map;
+
+  /* Overwrite the .exe extension on the executable file name with
+     the .map extension.  */
+  strcpy (map_filename, p_infile->name);
+  n = strlen (map_filename) - 3;
+  strcpy (&map_filename[n], "map");
+
+  map = fopen (map_filename, "r");
+  if (!map)
+    {
+      printf ("Failed to open map file %s, error %d...bailing out.\n",
+             map_filename, GetLastError ());
+      exit (-1);
+    }
+
+  while (fgets (buffer, sizeof (buffer), map))
+    {
+      if (!(strstr (buffer, ".bss") && strstr (buffer, "DATA")))
+       continue;
+      n = sscanf (buffer, " %*d:%x %x", &start, &len);
+      if (n != 2)
+       {
+         printf ("Failed to scan the .bss section line:\n%s", buffer);
+         exit (-1);
+       }
+      break;
+    }
+  *p_bss_start = (PUCHAR) start;
+  *p_bss_size = (DWORD) len;
+}
 
 static unsigned long
 get_section_size (PIMAGE_SECTION_HEADER p_section)
@@ -275,7 +349,7 @@ get_section_info (file_data *p_infile)
 {
   PIMAGE_DOS_HEADER dos_header;
   PIMAGE_NT_HEADERS nt_header;
-  PIMAGE_SECTION_HEADER section;
+  PIMAGE_SECTION_HEADER section, data_section;
   unsigned char *ptr;
   int i;
   
@@ -319,6 +393,7 @@ get_section_info (file_data *p_infile)
          extern char my_edata[];
 
          /* The .data section.  */
+         data_section = section;
          ptr  = (char *) nt_header->OptionalHeader.ImageBase +
            section->VirtualAddress;
          data_start_va = ptr;
@@ -332,6 +407,21 @@ get_section_info (file_data *p_infile)
        }
       section++;
     }
+
+  if (!bss_start && !bss_size)
+    {
+      /* Starting with MSVC 4.0, the .bss section has been eliminated
+        and appended virtually to the end of the .data section.  Our
+        only hint about where the .bss section starts in the address
+        comes from the SizeOfRawData field in the .data section
+        header.  Unfortunately, this field is only approximate, as it
+        is a rounded number and is typically rounded just beyond the
+        start of the .bss section.  To find the start and size of the
+        .bss section exactly, we have to peek into the map file.  */
+      get_bss_info_from_map_file (p_infile, &ptr, &bss_size);
+      bss_start = ptr + nt_header->OptionalHeader.ImageBase
+       + data_section->VirtualAddress;
+    }
 }