Mercurial > hg > xemacs-beta

diff src/unexnt.c @ 814:a634e3b7acc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-04-14 12:41:59 by ben] latest changes TODO.ben-mule-21-5: Update. make-docfile.c: Add basic support for handling ISO 2022 doc strings -- we parse the basic charset designation sequences so we know whether we're in ASCII and have to pay attention to end quotes and such. Reformat code according to coding standards. abbrev.el: Add `global-abbrev-mode', which turns on or off abbrev-mode in all buffers. Added `defining-abbrev-turns-on-abbrev-mode' -- if non-nil, defining an abbrev through an interactive function will automatically turn on abbrev-mode, either globally or locally depending on the command. This is the "what you'd expect" behavior. indent.el: general function for indenting a balanced expression in a mode-correct way. Works similar to indent-region in that a mode can specify a specific command to do the whole operation; if not, figure out the region using forward-sexp and indent each line using indent-according-to-mode. keydefs.el: Removed. Modify M-C-backslash to do indent-region-or-balanced-expression. Make S-Tab just insert a TAB char, like it's meant to do. make-docfile.el: Now that we're using the call-process-in-lisp, we need to load an extra file win32-native.el because we're running a bare temacs. menubar-items.el: Totally redo the Cmds menu so that most used commands appear directly on the menu and less used commands appear in submenus. The old way may have been very pretty, but rather impractical. process.el: Under Windows, don't ever use old-call-process-internal, even in batch mode. We can do processes in batch mode. subr.el: Someone recoded truncate-string-to-width, saying "the FSF version is too complicated and does lots of hard-to-understand stuff" but the resulting recoded version was *totally* wrong! it misunderstood the basic point of this function, which is work in *columns* not chars. i dumped ours and copied the version from FSF 21.1. Also added truncate-string-with-continuation-dots, since this idiom is used often. config.inc.samp, xemacs.mak: Separate out debug and optimize flags. Remove all vestiges of USE_MINIMAL_TAGBITS, USE_INDEXED_LRECORD_IMPLEMENTATION, and GUNG_HO, since those ifdefs have long been removed. Make error-checking support actually work. Some rearrangement of config.inc.samp to make it more logical. Remove callproc.c and ntproc.c from xemacs.mak, no longer used. Make pdump the default. lisp.h: Add support for strong type-checking of Bytecount, Bytebpos, Charcount, Charbpos, and others, by making them classes, overloading the operators to provide integer-like operation and carefully controlling what operations are allowed. Not currently enabled in C++ builds because there are still a number of compile errors, and it won't really work till we merge in my "8-bit-Mule" workspace, in which I make use of the new types Charxpos, Bytexpos, Memxpos, representing a "position" either in a buffer or a string. (This is especially important in the extent code.) abbrev.c, alloc.c, eval.c, buffer.c, buffer.h, editfns.c, fns.c, text.h: Warning fixes, some of them related to new C++ strict type checking of Bytecount, Charbpos, etc. dired.c: Caught an actual error due to strong type checking -- char len being passed when should be byte len. alloc.c, backtrace.h, bytecode.c, bytecode.h, eval.c, sysdep.c: Further optimize Ffuncall: -- process arg list at compiled-function creation time, converting into an array for extra-quick access at funcall time. -- rewrite funcall_compiled_function to use it, and inline this function. -- change the order of check for magic stuff in SPECBIND_FAST_UNSAFE to be faster. -- move the check for need to garbage collect into the allocation code, so only a single flag needs to be checked in funcall. buffer.c, symbols.c: add debug funs to check on mule optimization info in buffers and strings. eval.c, emacs.c, text.c, regex.c, scrollbar-msw.c, search.c: Fix evil crashes due to eistrings not properly reinitialized under pdump. Redo a bit some of the init routines; convert some complex_vars_of() into simple vars_of(), because they didn't need complex processing. callproc.c, emacs.c, event-stream.c, nt.c, process.c, process.h, sysdep.c, sysdep.h, syssignal.h, syswindows.h, ntproc.c: Delete. Hallelujah, praise the Lord, there is no god but Allah!!! fix so that processes can be invoked in bare temacs -- thereby eliminating any need for callproc.c. (currently only eliminated under NT.) remove all crufty and unnecessary old process code in ntproc.c and elsewhere. move non-callproc-specific stuff (mostly environment) into process.c, so callproc.c can be left out under NT. console-tty.c, doc.c, file-coding.c, file-coding.h, lstream.c, lstream.h: fix doc string handling so it works with Japanese, etc docs. change handling of "character mode" so callers don't have to manually set it (quite error-prone). event-msw.c: spacing fixes. lread.c: eliminate unused crufty vintage-19 "FSF defun hack" code. lrecord.h: improve pdump description docs. buffer.c, ntheap.c, unexnt.c, win32.c, emacs.c: Mule-ize some unexec and startup code. It was pseudo-Mule-ized before by simply always calling the ...A versions of functions, but that won't cut it -- eventually we want to be able to run properly even if XEmacs has been installed in a Japanese directory. (The current problem is the timing of the loading of the Unicode tables; this will eventually be fixed.) Go through and fix various other places where the code was not Mule-clean. Provide a function mswindows_get_module_file_name() to get our own name without resort to PATH_MAX and such. Add a big comment in main() about the problem with Unicode table load timing that I just alluded to. emacs.c: When error-checking is enabled (interpreted as "user is developing XEmacs"), don't ask user to "pause to read messages" when a fatal error has occurred, because it will wedge if we are in an inner modal loop (typically when a menu is popped up) and make us unable to get a useful stack trace in the debugger. text.c: Correct update_entirely_ascii_p_flag to actually work. lisp.h, symsinit.h: declarations for above changes.
author ben
date Sun, 14 Apr 2002 12:43:31 +0000
parents f846c2ef930d
children 804517e16990
line wrap: on
line diff
--- a/src/unexnt.c	Sat Apr 13 20:44:53 2002 +0000
+++ b/src/unexnt.c	Sun Apr 14 12:43:31 2002 +0000
@@ -22,6 +22,8 @@
 
 /* Adapted for XEmacs by David Hobley <david@spook-le0.cia.com.au> */
 
+/* This file has been Mule-ized, Ben Wing, 4-13-02. */
+
 /* The linkers that come with MSVC >= 4.0 merge .bss into .data and reorder
  * uninitialised data so that the .data section looks like:
  *
@@ -118,6 +120,8 @@
 
   /* Cache system info, e.g., the NT page size.  */
   cache_system_info ();
+  /* Set OS type, so that tchar stuff below works */
+  init_win32_very_early ();
 
   /* If we're a dumped version of emacs then we need to recreate
      our heap and play tricks with our .bss section.  Do this before
@@ -126,9 +130,11 @@
      won't work.)  */
   if (heap_state == HEAP_UNLOADED) 
     {
-      char executable_path[PATH_MAX];
+      Extbyte executable_path[MAX_PATH * MAX_XETCHAR_SIZE];
 
-      if (GetModuleFileNameA (NULL, executable_path, PATH_MAX) == 0) 
+      /* Don't use mswindows_get_module_file_name() because it uses
+	 xmalloc() */
+      if (qxeGetModuleFileName (NULL, executable_path, MAX_PATH) == 0)
 	{
 	  exit (1);
 	}
@@ -137,10 +143,12 @@
 	 the renamed file still loads its heap from xemacs.exe --kkm */
 #if 0
       {
+	Extbyte *p;
+	
 	/* To allow profiling, make sure executable_path names the .exe
 	   file, not the file created by the profiler */
-	char *p = strrchr (executable_path, '\\');
-	strcpy (p+1, PATH_PROGNAME ".exe");
+	p = xetcsrchr (executable_path, '\\');
+	xetcscpy (p + 1, XETEXT (PATH_PROGNAME ".exe"));
       }
 #endif
 
@@ -168,29 +176,30 @@
 
 /* Dump out .data and .bss sections into a new executable.  */
 int
-unexec (char *new_name, char *old_name, unsigned int start_data,
+unexec (Intbyte *new_name, Intbyte *old_name, unsigned int start_data,
 	unsigned int start_bss, unsigned int entry_address)
 {
   file_data in_file, out_file;
-  char out_filename[PATH_MAX], in_filename[PATH_MAX];
+  Intbyte *out_filename = alloca_intbytes (qxestrlen (new_name) + 10);
+  Intbyte *in_filename = alloca_intbytes (qxestrlen (old_name) + 10);
   unsigned long size;
-  char *ptr;
+  Intbyte *ptr;
   HINSTANCE hImagehelp;
   
   /* Make sure that the input and output filenames have the
      ".exe" extension...patch them up if they don't.  */
-  strcpy (in_filename, old_name);
-  ptr = in_filename + strlen (in_filename) - 4;
-  if (strcmp (ptr, ".exe"))
-    strcat (in_filename, ".exe");
+  qxestrcpy (in_filename, old_name);
+  ptr = in_filename + qxestrlen (in_filename) - 4;
+  if (qxestrcmp (ptr, ".exe"))
+    qxestrcat (in_filename, ".exe");
 
-  strcpy (out_filename, new_name);
-  ptr = out_filename + strlen (out_filename) - 4;
-  if (strcmp (ptr, ".exe"))
-    strcat (out_filename, ".exe");
+  qxestrcpy (out_filename, new_name);
+  ptr = out_filename + qxestrlen (out_filename) - 4;
+  if (qxestrcmp (ptr, ".exe"))
+    qxestrcat (out_filename, ".exe");
 
-  printf ("Dumping from %s\n", in_filename);
-  printf ("          to %s\n", out_filename);
+  stdout_out ("Dumping from %s\n", in_filename);
+  stdout_out ("          to %s\n", out_filename);
 
   /* We need to round off our heap to NT's allocation unit (64KB).  */
   round_heap (get_allocation_unit ());
@@ -198,8 +207,8 @@
   /* Open the undumped executable file.  */
   if (!open_input_file (&in_file, in_filename))
     {
-      printf ("Failed to open %s (%d)...bailing.\n", 
-	      in_filename, GetLastError ());
+      stdout_out ("Failed to open %s (%d)...bailing.\n", 
+		  in_filename, GetLastError ());
       exit (1);
     }
 
@@ -209,12 +218,12 @@
   /* 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 ());
+    round_to_next ((UChar_Binary *) in_file.size, get_allocation_unit ());
   size = heap_index_in_executable + get_committed_heap_size () + bss_size;
   if (!open_output_file (&out_file, out_filename, size))
     {
-      printf ("Failed to open %s (%d)...bailing.\n", 
-	      out_filename, GetLastError ());
+      stdout_out ("Failed to open %s (%d)...bailing.\n", 
+		  out_filename, GetLastError ());
       exit (1);
     }
 
@@ -236,7 +245,8 @@
     pfnCheckSumMappedFile_t pfnCheckSumMappedFile;
 
     dos_header = (PIMAGE_DOS_HEADER) out_file.file_base;
-    nt_header = (PIMAGE_NT_HEADERS) ((char *) dos_header + dos_header->e_lfanew);
+    nt_header = (PIMAGE_NT_HEADERS) ((UChar_Binary *) dos_header +
+				     dos_header->e_lfanew);
 
     nt_header->OptionalHeader.CheckSum = 0;
 #if 0
@@ -276,21 +286,21 @@
 			    DWORD *p_bss_size)
 {
   int n, start, len;
-  char map_filename[PATH_MAX];
-  char buffer[256];
+  Intbyte *map_filename = alloca_intbytes (qxestrlen (p_infile->name) + 10);
+  Extbyte 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");
+  qxestrcpy (map_filename, p_infile->name);
+  n = qxestrlen (map_filename) - 3;
+  qxestrcpy (&map_filename[n], "map");
 
-  map = fopen (map_filename, "r");
+  map = qxe_fopen (map_filename, "r");
   if (!map)
     {
-      printf ("Failed to open map file %s, error %d...bailing out.\n",
-	      map_filename, GetLastError ());
+      stdout_out ("Failed to open map file %s, error %d...bailing out.\n",
+		  map_filename, GetLastError ());
       exit (-1);
     }
 
@@ -301,6 +311,7 @@
       n = sscanf (buffer, " %*d:%x %x", &start, &len);
       if (n != 2)
 	{
+	  /* printf with external data, stdout_out with internal */
 	  printf ("Failed to scan the .bss section line:\n%s", buffer);
 	  exit (-1);
 	}
@@ -318,29 +329,29 @@
   PIMAGE_DOS_HEADER dos_header;
   PIMAGE_NT_HEADERS nt_header;
   PIMAGE_SECTION_HEADER section, data_section;
-  unsigned char *ptr;
+  UChar_Binary *ptr;
   int i;
   
   dos_header = (PIMAGE_DOS_HEADER) p_infile->file_base;
   if (dos_header->e_magic != IMAGE_DOS_SIGNATURE) 
     {
-      printf ("Unknown EXE header in %s...bailing.\n", p_infile->name);
+      stdout_out ("Unknown EXE header in %s...bailing.\n", p_infile->name);
       exit (1);
     }
   nt_header = (PIMAGE_NT_HEADERS) (((unsigned long) dos_header) + 
 				   dos_header->e_lfanew);
   if (nt_header == NULL) 
     {
-      printf ("Failed to find IMAGE_NT_HEADER in %s...bailing.\n", 
-	     p_infile->name);
+      stdout_out ("Failed to find IMAGE_NT_HEADER in %s...bailing.\n", 
+		  p_infile->name);
       exit (1);
     }
 
   /* Check the NT header signature ...  */
   if (nt_header->Signature != IMAGE_NT_SIGNATURE) 
     {
-      printf ("Invalid IMAGE_NT_SIGNATURE 0x%x in %s...bailing.\n",
-	      nt_header->Signature, p_infile->name);
+      stdout_out ("Invalid IMAGE_NT_SIGNATURE 0x%x in %s...bailing.\n",
+		  nt_header->Signature, p_infile->name);
     }
 
   /* Flip through the sections for .data and .bss ...  */
@@ -352,10 +363,10 @@
 	{
 	  extern int my_ebss;		/* From lastfile.c  */
 
-	  ptr = (char *) nt_header->OptionalHeader.ImageBase +
+	  ptr = (UChar_Binary *) nt_header->OptionalHeader.ImageBase +
 	    section->VirtualAddress;
 	  bss_start = ptr;
-	  bss_size = (char*)&my_ebss - (char*)bss_start;
+	  bss_size = (UChar_Binary*) &my_ebss - (UChar_Binary*) bss_start;
 	}
 
       if (!strcmp (section->Name, ".data")) 
@@ -363,11 +374,11 @@
       if (!strcmp (section->Name, "xdata"))
 #endif
 	{
-	  extern char my_edata[];	/* From lastfile.c  */
+	  extern Char_Binary my_edata[];	/* From lastfile.c  */
 
 	  /* The .data section.  */
 	  data_section = section;
-	  ptr = (char *) nt_header->OptionalHeader.ImageBase +
+	  ptr = (UChar_Binary *) nt_header->OptionalHeader.ImageBase +
 	    section->VirtualAddress;
 	  data_start_va = ptr;
 	  data_start_file = section->PointerToRawData;
@@ -382,8 +393,8 @@
 	  /* This code doesn't know how to grow the raw size of a section. */
 	  if (section->SizeOfRawData < section->Misc.VirtualSize)
 	    {
-	      printf ("The emacs data section is smaller than expected"
-		      "...bailing.\n");
+	      stdout_out ("The emacs data section is smaller than expected"
+			  "...bailing.\n");
 	      exit (1);
 	    }
 #endif
@@ -407,7 +418,7 @@
       get_bss_info_from_map_file (p_infile, &ptr, &bss_size);
       bss_start = ptr + nt_header->OptionalHeader.ImageBase
 	+ data_section->VirtualAddress;
-      bss_size = (char*)&my_ebss - (char*)bss_start;
+      bss_size = (UChar_Binary *) &my_ebss - (UChar_Binary *) bss_start;
     }
 #else
   bss_size = 0;
@@ -418,6 +429,7 @@
 /* The dump routines.  */
 
 #ifdef DEBUG_XEMACS
+/* printf with external data, stdout_out with internal */
 #define DUMP_MSG(x) printf x
 #else
 #define DUMP_MSG(x)
@@ -427,11 +439,11 @@
 copy_executable_and_dump_data_section (file_data *p_infile,
 				       file_data *p_outfile)
 {
-  unsigned char *data_file, *data_va;
+  UChar_Binary *data_file, *data_va;
   unsigned long size, index;
 
   /* Get a pointer to where the raw data should go in the executable file.  */
-  data_file = (char *) p_outfile->file_base + data_start_file;
+  data_file = (UChar_Binary *) p_outfile->file_base + data_start_file;
 
   /* Get a pointer to the raw data in our address space.  */
   data_va = data_start_va;
@@ -447,7 +459,8 @@
   DUMP_MSG (("Dumping data section...\n"));
   DUMP_MSG (("\t0x%08x Address in process.\n", data_va));
   DUMP_MSG (("\t0x%08x Offset in output file.\n", 
-	     (char*) data_file - (char *) p_outfile->file_base));
+	     (UChar_Binary *) data_file -
+	     (UChar_Binary *) p_outfile->file_base));
   DUMP_MSG (("\t0x%08x Size in bytes.\n", size));
   memcpy (data_file, data_va, size);
 
@@ -457,38 +470,38 @@
   DUMP_MSG (("\t0x%08x Offset in input file.\n", index));
   DUMP_MSG (("\t0x%08x Offset in output file.\n", index));
   DUMP_MSG (("\t0x%08x Size in bytes.\n", size));
-  memcpy ((char *) p_outfile->file_base + index, 
-	  (char *) p_infile->file_base + index, size);
+  memcpy ((UChar_Binary *) p_outfile->file_base + index, 
+	  (UChar_Binary *) p_infile->file_base + index, size);
 }
 
 static void
 dump_bss_and_heap (file_data *p_infile, file_data *p_outfile)
 {
-    unsigned char *heap_data;
-    unsigned long size, index;
+  UChar_Binary *heap_data;
+  unsigned long size, index;
 
-    DUMP_MSG (("Dumping heap onto end of executable...\n"));
+  DUMP_MSG (("Dumping heap onto end of executable...\n"));
 
-    index = heap_index_in_executable;
-    size = get_committed_heap_size ();
-    heap_data = get_heap_start ();
+  index = heap_index_in_executable;
+  size = get_committed_heap_size ();
+  heap_data = get_heap_start ();
 
-    DUMP_MSG (("\t0x%08x Heap start in process.\n", heap_data));
-    DUMP_MSG (("\t0x%08x Heap offset in executable.\n", index));
-    DUMP_MSG (("\t0x%08x Heap size in bytes.\n", size));
+  DUMP_MSG (("\t0x%08x Heap start in process.\n", heap_data));
+  DUMP_MSG (("\t0x%08x Heap offset in executable.\n", index));
+  DUMP_MSG (("\t0x%08x Heap size in bytes.\n", size));
 
-    memcpy ((PUCHAR) p_outfile->file_base + index, heap_data, size);
+  memcpy ((PUCHAR) p_outfile->file_base + index, heap_data, size);
 
 #ifndef DUMP_SEPARATE_SECTION
-    DUMP_MSG (("Dumping bss onto end of executable...\n"));
+  DUMP_MSG (("Dumping bss onto end of executable...\n"));
     
-    index += size;
-    size = bss_size;
+  index += size;
+  size = bss_size;
 
-    DUMP_MSG (("\t0x%08x BSS start in process.\n", bss_start));
-    DUMP_MSG (("\t0x%08x BSS offset in executable.\n", index));
-    DUMP_MSG (("\t0x%08x BSS size in bytes.\n", size));
-    memcpy ((char *) p_outfile->file_base + index, bss_start, size);
+  DUMP_MSG (("\t0x%08x BSS start in process.\n", bss_start));
+  DUMP_MSG (("\t0x%08x BSS offset in executable.\n", index));
+  DUMP_MSG (("\t0x%08x BSS size in bytes.\n", size));
+  memcpy ((UChar_Binary *) p_outfile->file_base + index, bss_start, size);
 #endif
 }
 
@@ -500,14 +513,14 @@
 /* Load the dumped .bss section into the .bss area of our address space.  */
 /* Already done if the .bss  was part of a separate emacs data section */
 void
-read_in_bss (char *filename)
+read_in_bss (Extbyte *filename)
 {
 #ifndef DUMP_SEPARATE_SECTION
   HANDLE file;
   unsigned long index, n_read;
 
-  file = CreateFile (filename, GENERIC_READ, FILE_SHARE_READ, NULL,
-		     OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+  file = qxeCreateFile (filename, GENERIC_READ, FILE_SHARE_READ, NULL,
+			OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
   if (file == INVALID_HANDLE_VALUE)
     abort ();
   
@@ -527,21 +540,21 @@
 
 /* Map the heap dumped into the executable file into our address space.  */
 void 
-map_in_heap (char *filename)
+map_in_heap (Extbyte *filename)
 {
   HANDLE file;
   HANDLE file_mapping;
   void  *file_base;
   unsigned long size, upper_size, n_read;
 
-  file = CreateFileA (filename, GENERIC_READ, FILE_SHARE_READ, NULL,
-		      OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+  file = qxeCreateFile (filename, GENERIC_READ, FILE_SHARE_READ, NULL,
+			OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
   if (file == INVALID_HANDLE_VALUE) 
     abort ();
 
   size = GetFileSize (file, &upper_size);
-  file_mapping = CreateFileMappingA (file, NULL, PAGE_WRITECOPY, 
-				     0, size, NULL);
+  file_mapping = qxeCreateFileMapping (file, NULL, PAGE_WRITECOPY, 
+				       0, size, NULL);
   if (!file_mapping) 
     abort ();