Enumerate operating system types.

Declare extern data and functions.
Move file_data struct definition here.
(OFFSET_TO_RVA, RVA_TO_OFFSET, RVA_TO_PTR): New macros.

diff --git a/src/w32heap.h b/src/w32heap.h
index 24ed080ff7f42ae98a43a5d0158083e4a5417267..d2b05ba6e7c2f187b419e6f7338abaebac409ad0 100644 (file)
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -48,6 +48,13 @@ extern BOOL                need_to_recreate_heap;
 extern int           w32_major_version;
 extern int           w32_minor_version;
 
+enum {
+  OS_WIN95 = 1,
+  OS_NT
+};
+
+extern int os_subtype;
+
 /* Emulation of Unix sbrk().  */
 extern void *sbrk (unsigned long size);
 
@@ -70,4 +77,37 @@ extern void cache_system_info (void);
 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;
+
+#define OFFSET_TO_RVA(var,section) \
+         (section->VirtualAddress + ((DWORD)(var) - section->PointerToRawData))
+
+#define RVA_TO_OFFSET(var,section) \
+         (section->PointerToRawData + ((DWORD)(var) - section->VirtualAddress))
+
+#define RVA_TO_PTR(var,section,filedata) \
+         ((void *)(RVA_TO_OFFSET(var,section) + (filedata).file_base))
+
+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);
+
+unsigned long get_section_size (PIMAGE_SECTION_HEADER p_section);
+
+/* 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_ */