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 /src | |
| 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 'src')
| -rw-r--r-- | src/logic/pe_get_image_meta.c | 14 | ||||
| -rw-r--r-- | src/reader/pe_read_import_header.c | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/logic/pe_get_image_meta.c b/src/logic/pe_get_image_meta.c index 0a8de47..20ab387 100644 --- a/src/logic/pe_get_image_meta.c +++ b/src/logic/pe_get_image_meta.c @@ -242,8 +242,8 @@ int pe_get_image_meta( } /* .idata */ - struct pe_import_hdr * pidata; - union pe_import_lookup * pitem; + struct pe_raw_import_hdr * pidata; + union pe_raw_import_lookup * pitem; i = pe_get_named_section_index(m,".idata"); s = pe_get_block_section_index(m,&m->opt.dirs.import_tbl); @@ -254,11 +254,11 @@ int pe_get_image_meta( if (s >= 0) { m->hidata = &m->sectbl[s]; - m->aidata = (struct pe_import_hdr *)(base + m->sectbl[s].ptr_to_raw_data + m->aidata = (struct pe_raw_import_hdr *)(base + m->sectbl[s].ptr_to_raw_data + m->opt.dirs.import_tbl.rva - m->sectbl[s].virtual_addr); } else if (i >= 0) { m->hidata = &m->sectbl[i]; - m->aidata = (struct pe_import_hdr *)(base + m->sectbl[i].ptr_to_raw_data); + m->aidata = (struct pe_raw_import_hdr *)(base + m->sectbl[i].ptr_to_raw_data); } if (m->aidata) { @@ -278,7 +278,7 @@ int pe_get_image_meta( + m->idata[i].name_rva - m->hidata->virtual_addr; if (m->idata[i].import_lookup_tbl_rva) - m->idata[i].aitems = (union pe_import_lookup *)(base + m->hidata->ptr_to_raw_data + m->idata[i].aitems = (union pe_raw_import_lookup *)(base + m->hidata->ptr_to_raw_data + m->idata[i].import_lookup_tbl_rva - m->hidata->virtual_addr); /* items */ @@ -316,8 +316,8 @@ int pe_get_image_meta( } if (!m->idata[i].items[j].flags) { - struct pe_hint_name_entry * pentry = - (struct pe_hint_name_entry *)(base + m->hidata->ptr_to_raw_data + struct pe_raw_hint_name_entry * pentry = + (struct pe_raw_hint_name_entry *)(base + m->hidata->ptr_to_raw_data + m->idata[i].items[j].u.hint_name_tbl_rva - m->hidata->virtual_addr); m->idata[i].items[j].name = (char *)pentry->name; diff --git a/src/reader/pe_read_import_header.c b/src/reader/pe_read_import_header.c index e656185..624313b 100644 --- a/src/reader/pe_read_import_header.c +++ b/src/reader/pe_read_import_header.c @@ -10,7 +10,7 @@ #include "perk_endian_impl.h" #include "perk_reader_impl.h" -int pe_read_import_header(const struct pe_import_hdr * p, struct pe_meta_import_hdr * m) +int pe_read_import_header(const struct pe_raw_import_hdr * p, struct pe_meta_import_hdr * m) { m->import_lookup_tbl_rva = pe_read_long(p->import_lookup_tbl_rva); m->time_date_stamp = pe_read_long(p->time_date_stamp); @@ -25,7 +25,7 @@ int pe_read_import_header(const struct pe_import_hdr * p, struct pe_meta_import_ } int pe_read_import_lookup( - const union pe_import_lookup * p, + const union pe_raw_import_lookup * p, struct pe_meta_import_lookup * m, uint32_t magic) { |