From de5b3010350adbf3c5b9ceb12ddc0a2658a0f5ac Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Nov 19 2016 19:44:25 +0000
Subject: PE format: struct pe_image_dos_hdr --> struct pe_raw_image_dos_hdr.


---

diff --git a/include/pemagine/pe_structs.h b/include/pemagine/pe_structs.h
index 2baabb0..aa5fd69 100644
--- a/include/pemagine/pe_structs.h
+++ b/include/pemagine/pe_structs.h
@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-struct pe_image_dos_hdr {
+struct pe_raw_image_dos_hdr {
 	unsigned char	dos_magic			[0x02];		/* 0x00 */
 	unsigned char	dos_cblp			[0x02];		/* 0x02 */
 	unsigned char	dos_cp				[0x02];		/* 0x04 */
diff --git a/include/pemagine/pemagine.h b/include/pemagine/pemagine.h
index 9845a48..db1023a 100644
--- a/include/pemagine/pemagine.h
+++ b/include/pemagine/pemagine.h
@@ -152,7 +152,7 @@ typedef int pe_enum_image_import_hdrs_callback(
 	void *				context);
 
 /* library functions */
-pe_api struct pe_image_dos_hdr *	pe_get_image_dos_hdr_addr	(const void * base);
+pe_api struct pe_raw_image_dos_hdr *	pe_get_image_dos_hdr_addr	(const void * base);
 pe_api struct pe_coff_file_hdr *	pe_get_image_coff_hdr_addr	(const void * base);
 pe_api union  pe_opt_hdr *		pe_get_image_opt_hdr_addr	(const void * base);
 pe_api struct pe_data_dirs *		pe_get_image_data_dirs_addr	(const void * base);
diff --git a/src/headers/pe_get_image_coff_hdr_addr.c b/src/headers/pe_get_image_coff_hdr_addr.c
index d2ff03a..6951095 100644
--- a/src/headers/pe_get_image_coff_hdr_addr.c
+++ b/src/headers/pe_get_image_coff_hdr_addr.c
@@ -12,7 +12,7 @@
 pe_api
 struct pe_coff_file_hdr * pe_get_image_coff_hdr_addr(const void * base)
 {
-	struct pe_image_dos_hdr *	dos;
+	struct pe_raw_image_dos_hdr *	dos;
 	struct pe_coff_file_hdr *	coff;
 	uint32_t *			offset;
 
diff --git a/src/headers/pe_get_image_dos_hdr_addr.c b/src/headers/pe_get_image_dos_hdr_addr.c
index 279d04e..a18f1df 100644
--- a/src/headers/pe_get_image_dos_hdr_addr.c
+++ b/src/headers/pe_get_image_dos_hdr_addr.c
@@ -11,11 +11,11 @@
 #include <pemagine/pemagine.h>
 
 pe_api
-struct pe_image_dos_hdr * pe_get_image_dos_hdr_addr(const void * base)
+struct pe_raw_image_dos_hdr * pe_get_image_dos_hdr_addr(const void * base)
 {
-	struct pe_image_dos_hdr * dos;
+	struct pe_raw_image_dos_hdr * dos;
 
-	dos = (struct pe_image_dos_hdr *)base;
+	dos = (struct pe_raw_image_dos_hdr *)base;
 
 	if ((dos->dos_magic[0] == 'M') && (dos->dos_magic[1] == 'Z'))
 		return dos;