(Fcall_process): Sync with HEAD.

[bpt/emacs.git] / src / w32heap.h

diff --git a/src/w32heap.h b/src/w32heap.h
index 24ed080..c862558 100644 (file)
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -1,5 +1,6 @@
 /* Heap management routines (including unexec) for GNU Emacs on Windows NT.
-   Copyright (C) 1994 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
 
    Geoff Voelker (voelker@cs.washington.edu)                        7-29-94
 */
@@ -26,6 +27,9 @@ Boston, MA 02111-1307, USA.
 
 #include <windows.h>
 
+#define ROUND_UP(p, align)   (((DWORD)(p) + (align)-1) & ~((align)-1))
+#define ROUND_DOWN(p, align) ((DWORD)(p) & ~((align)-1))
+
 /*
  * Heap related stuff.
  */
@@ -41,33 +45,56 @@ Boston, MA 02111-1307, USA.
 
 extern unsigned char *get_data_start();
 extern unsigned char *get_data_end();
-extern unsigned long  data_region_size;
 extern unsigned long  reserved_heap_size;
 extern SYSTEM_INFO    sysinfo_cache;
-extern BOOL          need_to_recreate_heap;
+extern OSVERSIONINFO  osinfo_cache;
+extern BOOL          using_dynamic_heap;
 extern int           w32_major_version;
 extern int           w32_minor_version;
+extern int           w32_build_number;
+
+enum {
+  OS_WIN95 = 1,
+  OS_NT
+};
+
+extern int os_subtype;
 
 /* Emulation of Unix sbrk().  */
 extern void *sbrk (unsigned long size);
 
-/* Recreate the heap created during dumping.  */
-extern void recreate_heap (char *executable_path);
+/* Initialize heap structures for sbrk on startup.  */
+extern void init_heap ();
 
 /* Round the heap to this size.  */
 extern void round_heap (unsigned long size);
 
-/* Load in the dumped .bss section.  */
-extern void read_in_bss (char *name);
-
-/* Map in the dumped heap.  */
-extern void map_in_heap (char *name);
-
 /* Cache system info, e.g., the NT page size.  */
 extern void cache_system_info (void);
 
-/* Round ADDRESS up to be aligned with ALIGN.  */
-extern unsigned char *round_to_next (unsigned char *address, 
-                                    unsigned long align);
+/* ----------------------------------------------------------------- */
+/* Useful routines for manipulating memory-mapped files. */
+
+typedef struct file_data {
+    char          *name;
+    unsigned long  size;
+    HANDLE         file;
+    HANDLE         file_mapping;
+    unsigned char *file_base;
+} file_data;
+
+int open_input_file (file_data *p_file, char *name);
+int open_output_file (file_data *p_file, char *name, unsigned long size);
+void close_file_data (file_data *p_file);
+
+/* Return pointer to section header for named section. */
+IMAGE_SECTION_HEADER * find_section (char * name, IMAGE_NT_HEADERS * nt_header);
+
+/* 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);
 
 #endif /* NTHEAP_H_ */
+
+/* arch-tag: 3ba4cbe1-8a09-4a41-8f37-fd31f7426b3c
+   (do not change this comment) */