xemacs-beta: src/unexnt.c comparison

comparison src/unexnt.c @ 442:abe6d1db359e r21-2-36

Import from CVS: tag r21-2-36

author	cvs
date	Mon, 13 Aug 2007 11:35:02 +0200
parents	8de8e3f6228a
children	ed498ef2108b

comparison

equal deleted inserted replaced

-:72a7cfa4a488
+:abe6d1db359e
 * addition to the emacs data. This is wrong, but we appear to be able to
 * get away with it. A proper fix might involve the introduction of a static
 * version of my_ebss in lastfile.c and a new firstfile.c file.  jhar */
 #include <config.h>
-#include <stdlib.h> 	/* _fmode */
+#include "lisp.h"
-#include <stdio.h>
-#include <fcntl.h>
+#include "syswindows.h"
-#include <windows.h>
+#include "nt.h"
+#include "ntheap.h"
 /* From IMAGEHLP.H which is not installed by default by MSVC < 5 */
 /* The IMAGEHLP.DLL library is not distributed by default with Windows95 */
-PIMAGE_NT_HEADERS
+typedef PIMAGE_NT_HEADERS
-(__stdcall * pfnCheckSumMappedFile) (LPVOID BaseAddress, DWORD FileLength,
+(__stdcall * pfnCheckSumMappedFile_t) (LPVOID BaseAddress, DWORD FileLength,
-				     LPDWORD HeaderSum, LPDWORD CheckSum);
+				       LPDWORD HeaderSum, LPDWORD CheckSum);
 #if 0
 extern BOOL ctrl_c_handler (unsigned long type);
 #endif
-#include "ntheap.h"
+/* Sync with FSF Emacs 19.34.6
+note: struct file_data is now defined in nt.h */
-/* Sync with FSF Emacs 19.34.6 note: struct file_data is now defined in ntheap.h */
 enum {
 HEAP_UNINITIALIZED = 1,
 HEAP_UNLOADED,
 HEAP_LOADED
 DWORD  data_size = UNINIT_LONG;
 /* Cached info about the .bss section in the executable.  */
 PUCHAR bss_start = UNINIT_PTR;
 DWORD  bss_size = UNINIT_LONG;
-#ifdef HAVE_NTGUI
-HINSTANCE hinst = NULL;
-HINSTANCE hprevinst = NULL;
-LPSTR lpCmdLine = "";
-int nCmdShow = 0;
-#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
 code supplied by NT (primarily because that code relies upon malloc ()).  */
 /* #### This is bogus, too. _fmode is set to different values
 when we run `xemacs' and `temacs run-emacs'. The sooner we
 hit and fix all the weirdities this causes us, the better --kkm */
 #if 0
 /* The default behavior is to treat files as binary and patch up
-text files appropriately, in accordance with the MSDOS code.  */
+text files appropriately.  */
 _fmode = O_BINARY;
 #endif
 #if 0
 /* This prevents ctrl-c's in shells running while we're suspended from
 having us exit.  */
 SetConsoleCtrlHandler ((PHANDLER_ROUTINE) ctrl_c_handler, TRUE);
 #endif
-/* Invoke the NT CRT startup routine now that our housecleaning
-is finished.  */
-#ifdef HAVE_NTGUI
-/* determine WinMain args like crt0.c does */
-hinst = GetModuleHandle(NULL);
-lpCmdLine = GetCommandLine();
-nCmdShow = SW_SHOWDEFAULT;
-#endif
 mainCRTStartup ();
 }
 /* Dump out .data and .bss sections into a new executable.  */
-void
+int
-unexec (char *new_name, char *old_name, void *start_data, void *start_bss,
+unexec (char *new_name, char *old_name, unsigned int start_data,
-	void *entry_address)
+	unsigned int start_bss, unsigned int entry_address)
 {
 file_data in_file, out_file;
 char out_filename[MAX_PATH], in_filename[MAX_PATH];
 unsigned long size;
 char *ptr;
-HANDLE hImagehelp;
+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;
 hImagehelp = LoadLibrary ("imagehlp.dll");
 if (hImagehelp)
 {
 PIMAGE_DOS_HEADER dos_header;
 PIMAGE_NT_HEADERS nt_header;
 DWORD  headersum;
 DWORD  checksum;
+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->OptionalHeader.CheckSum = 0;
-//    nt_header->FileHeader.TimeDateStamp = time (NULL);
+#if 0
-//    dos_header->e_cp = size / 512;
+nt_header->FileHeader.TimeDateStamp = time (NULL);
-//    nt_header->OptionalHeader.SizeOfImage = size;
+dos_header->e_cp = size / 512;
+nt_header->OptionalHeader.SizeOfImage = size;
-pfnCheckSumMappedFile = (void *) GetProcAddress (hImagehelp, "CheckSumMappedFile");
+#endif
+pfnCheckSumMappedFile =
+(pfnCheckSumMappedFile_t) GetProcAddress (hImagehelp,
+						"CheckSumMappedFile");
 if (pfnCheckSumMappedFile)
 {
-//	nt_header->FileHeader.TimeDateStamp = time (NULL);
+#if 0
+	nt_header->FileHeader.TimeDateStamp = time (NULL);
+#endif
 	pfnCheckSumMappedFile (out_file.file_base,
 			       out_file.size,
 			       &headersum,
 			       &checksum);
 	nt_header->OptionalHeader.CheckSum = checksum;
 FreeLibrary (hImagehelp);
 }
 close_file_data (&in_file);
 close_file_data (&out_file);
-}
+return 0;
-/* File handling.  */
-int
-open_output_file (file_data *p_file, CONST char *filename, unsigned long size)
-{
-HANDLE file;
-HANDLE file_mapping;
-void  *file_base;
-file = CreateFile (filename, GENERIC_READ | GENERIC_WRITE, 0, NULL,
-		     CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
-if (file == INVALID_HANDLE_VALUE)
-return FALSE;
-file_mapping = CreateFileMapping (file, NULL, PAGE_READWRITE,
-				    0, size, NULL);
-if (!file_mapping)
-return FALSE;
-file_base = MapViewOfFile (file_mapping, FILE_MAP_WRITE, 0, 0, size);
-if (file_base == 0)
-return FALSE;
-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;
 }
 /* Routines to manipulate NT executable file sections.  */
 #ifndef DUMP_SEPARATE_SECTION
 size = data_size;
 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",
-	     data_file - p_outfile->file_base));
+	     (char*)data_file - p_outfile->file_base));
 DUMP_MSG (("\t0x%08x Size in bytes.\n", size));
 memcpy (data_file, data_va, size);
 index = (DWORD) data_file + size - (DWORD) p_outfile->file_base;
 size = p_infile->size - index;

Mercurial > hg > xemacs-beta

comparison src/unexnt.c @ 442:abe6d1db359e r21-2-36