diff options
| author | midipix <writeonce@midipix.org> | 2016-11-19 13:37:43 -0500 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-11-19 13:37:43 -0500 |
| commit | 34ee9eb04f8ad9113ca92cc7a5aa2cd0d45e4330 (patch) | |
| tree | 6a7363dbc76a76d8325881e9e10bbc21f0bcc07c /include | |
| parent | 3161deb4b53f4683624ebd93d3d0945f4ed92576 (diff) | |
| download | perk-34ee9eb04f8ad9113ca92cc7a5aa2cd0d45e4330.tar.bz2 perk-34ee9eb04f8ad9113ca92cc7a5aa2cd0d45e4330.tar.xz | |
PE format: struct pe_import_hdr [and friends] --> struct pe_raw_import_hdr.
Diffstat (limited to 'include')
| -rw-r--r-- | include/perk/perk.h | 6 | ||||
| -rw-r--r-- | include/perk/perk_meta.h | 2 | ||||
| -rw-r--r-- | include/perk/perk_structs.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/perk/perk.h b/include/perk/perk.h index 81d396d..8bffb59 100644 --- a/include/perk/perk.h +++ b/include/perk/perk.h @@ -103,12 +103,12 @@ struct pe_image_meta { union pe_raw_opt_hdr * aopt; struct pe_raw_sec_hdr * asectbl; struct pe_raw_export_hdr * aedata; + struct pe_raw_import_hdr * aidata; struct pe_meta_export_hdr edata; struct pe_meta_sec_hdr * hedata; struct pe_meta_import_hdr * idata; - struct pe_import_hdr * aidata; struct pe_meta_sec_hdr * hidata; }; @@ -201,12 +201,12 @@ perk_api int pe_read_coff_header (const struct pe_raw_coff_file_hdr *, struct p perk_api int pe_read_optional_header (const union pe_raw_opt_hdr *, struct pe_meta_opt_hdr *); perk_api int pe_read_section_header (const struct pe_raw_sec_hdr *, struct pe_meta_sec_hdr *); perk_api int pe_read_export_header (const struct pe_raw_export_hdr *, struct pe_meta_export_hdr *); -perk_api int pe_read_import_header (const struct pe_import_hdr *, struct pe_meta_import_hdr *); +perk_api int pe_read_import_header (const struct pe_raw_import_hdr *, struct pe_meta_import_hdr *); perk_api int pe_read_coff_symbol (const struct pe_coff_symbol *, struct pe_meta_coff_symbol *, const struct pe_meta_coff_file_hdr *, void * base); -perk_api int pe_read_import_lookup (const union pe_import_lookup *, struct pe_meta_import_lookup *, +perk_api int pe_read_import_lookup (const union pe_raw_import_lookup *, struct pe_meta_import_lookup *, uint32_t magic); #ifdef __cplusplus diff --git a/include/perk/perk_meta.h b/include/perk/perk_meta.h index ea55b51..b3b5411 100644 --- a/include/perk/perk_meta.h +++ b/include/perk/perk_meta.h @@ -244,7 +244,7 @@ struct pe_meta_import_hdr { uint32_t count; char * name; struct pe_meta_import_lookup * items; - union pe_import_lookup * aitems; + union pe_raw_import_lookup * aitems; }; diff --git a/include/perk/perk_structs.h b/include/perk/perk_structs.h index 1eaf8a7..7113409 100644 --- a/include/perk/perk_structs.h +++ b/include/perk/perk_structs.h @@ -264,7 +264,7 @@ union pe_raw_export_addr_tbl { }; -union pe_import_lookup { +union pe_raw_import_lookup { unsigned char import_lookup_entry_64 [0x08]; /* 0x00 */ unsigned char import_lookup_entry_32 [0x04]; /* 0x00 */ unsigned char hint_name_tbl_rva [0x04]; /* 0x00 */ @@ -272,7 +272,7 @@ union pe_import_lookup { }; -struct pe_import_hdr { +struct pe_raw_import_hdr { unsigned char import_lookup_tbl_rva [0x04]; /* 0x00 */ unsigned char time_date_stamp [0x04]; /* 0x04 */ unsigned char forwarder_chain [0x04]; /* 0x08 */ @@ -281,7 +281,7 @@ struct pe_import_hdr { }; -struct pe_hint_name_entry { +struct pe_raw_hint_name_entry { unsigned char hint [0x02]; /* 0x00 */ unsigned char name [0x02]; /* 0x02 */ }; |