diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/pemagine/pe_structs.h | 22 | ||||
| -rw-r--r-- | include/pemagine/pemagine.h | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/include/pemagine/pe_structs.h b/include/pemagine/pe_structs.h index 9bc8aee..3ad8f9d 100644 --- a/include/pemagine/pe_structs.h +++ b/include/pemagine/pe_structs.h @@ -40,7 +40,7 @@ struct pe_raw_coff_file_hdr { }; -struct pe_opt_hdr_std { +struct pe_raw_opt_hdr_std { unsigned char magic [0x02]; /* 0x00 */ unsigned char major_linker_ver [0x01]; /* 0x02 */ unsigned char minor_linker_ver [0x01]; /* 0x03 */ @@ -51,12 +51,12 @@ struct pe_opt_hdr_std { unsigned char base_of_code [0x04]; /* 0x14 */ }; -struct pe_opt_hdr_align { +struct pe_raw_opt_hdr_align { unsigned char section_align [0x04]; /* 0x20 */ unsigned char file_align [0x04]; /* 0x24 */ }; -struct pe_opt_hdr_vers { +struct pe_raw_opt_hdr_vers { unsigned char major_os_ver [0x02]; /* 0x28 */ unsigned char minor_os_ver [0x02]; /* 0x2a */ unsigned char major_image_ver [0x02]; /* 0x2c */ @@ -66,7 +66,7 @@ struct pe_opt_hdr_vers { unsigned char win32_ver [0x04]; /* 0x34 */ }; -struct pe_opt_hdr_img { +struct pe_raw_opt_hdr_img { unsigned char size_of_image [0x04]; /* 0x38 */ unsigned char size_of_headers [0x04]; /* 0x3c */ unsigned char checksum [0x04]; /* 0x40 */ @@ -74,12 +74,12 @@ struct pe_opt_hdr_img { unsigned char dll_characteristics [0x02]; /* 0x46 */ }; -struct pe_opt_hdr_ldr { +struct pe_raw_opt_hdr_ldr { unsigned char loader_flags [0x04]; unsigned char rva_and_sizes [0x04]; }; -struct pe_opt_hdr_dirs { +struct pe_raw_opt_hdr_dirs { unsigned char export_tbl [0x08]; unsigned char import_tbl [0x08]; unsigned char resource_tbl [0x08]; @@ -118,7 +118,7 @@ struct pe_data_dirs { unsigned char reserved [0x08]; }; -struct pe_opt_hdr_32 { +struct pe_raw_opt_hdr_32 { unsigned char magic [0x02]; /* 0x00 */ unsigned char major_linker_ver [0x01]; /* 0x02 */ unsigned char minor_linker_ver [0x01]; /* 0x03 */ @@ -168,7 +168,7 @@ struct pe_opt_hdr_32 { }; -struct pe_opt_hdr_64 { +struct pe_raw_opt_hdr_64 { unsigned char magic [0x02]; /* 0x00 */ unsigned char major_linker_ver [0x01]; /* 0x02 */ unsigned char minor_linker_ver [0x01]; /* 0x03 */ @@ -217,9 +217,9 @@ struct pe_opt_hdr_64 { }; -union pe_opt_hdr { - struct pe_opt_hdr_32 opt_hdr_32; - struct pe_opt_hdr_64 opt_hdr_64; +union pe_raw_opt_hdr { + struct pe_raw_opt_hdr_32 opt_hdr_32; + struct pe_raw_opt_hdr_64 opt_hdr_64; }; diff --git a/include/pemagine/pemagine.h b/include/pemagine/pemagine.h index bc3e4dc..47eb96a 100644 --- a/include/pemagine/pemagine.h +++ b/include/pemagine/pemagine.h @@ -154,7 +154,7 @@ typedef int pe_enum_image_import_hdrs_callback( /* library functions */ pe_api struct pe_raw_image_dos_hdr * pe_get_image_dos_hdr_addr (const void * base); pe_api struct pe_raw_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 union pe_raw_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); pe_api struct pe_sec_hdr * pe_get_image_section_tbl_addr (const void * base); pe_api struct pe_sec_hdr * pe_get_image_named_section_addr (const void * base, const char * name); |