diff options
| author | midipix <writeonce@midipix.org> | 2016-12-01 06:12:09 -0500 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-12-01 08:00:30 -0500 |
| commit | 6e18ffe43809e43af86bbad8f46fcb1a428cb12a (patch) | |
| tree | b76530b4fce355bb0520b2a918887d53502e40ce /src | |
| parent | 9273055ccc18c5815e6f74c7adbac0bff1c2f7ae (diff) | |
| download | pemagine-6e18ffe43809e43af86bbad8f46fcb1a428cb12a.tar.bz2 pemagine-6e18ffe43809e43af86bbad8f46fcb1a428cb12a.tar.xz | |
struct pe_raw_opt_hdr_{32|64}: member name normalization.
Diffstat (limited to 'src')
| -rw-r--r-- | src/headers/pe_get_image_data_dirs_addr.c | 4 | ||||
| -rw-r--r-- | src/headers/pe_get_image_entry_point_addr.c | 4 | ||||
| -rw-r--r-- | src/headers/pe_get_image_section_tbl_addr.c | 2 | ||||
| -rw-r--r-- | src/meta/pe_get_image_stack_heap_info.c | 16 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/headers/pe_get_image_data_dirs_addr.c b/src/headers/pe_get_image_data_dirs_addr.c index aa55245..2edde04 100644 --- a/src/headers/pe_get_image_data_dirs_addr.c +++ b/src/headers/pe_get_image_data_dirs_addr.c @@ -22,10 +22,10 @@ struct pe_raw_data_dirs * pe_get_image_data_dirs_addr(const void * base) switch (*magic) { case PE_MAGIC_PE32: - return (struct pe_raw_data_dirs *)hdr->opt_hdr_32.rva_and_sizes; + return (struct pe_raw_data_dirs *)hdr->opt_hdr_32.coh_rva_and_sizes; case PE_MAGIC_PE32_PLUS: - return (struct pe_raw_data_dirs *)hdr->opt_hdr_64.rva_and_sizes; + return (struct pe_raw_data_dirs *)hdr->opt_hdr_64.coh_rva_and_sizes; default: return 0; diff --git a/src/headers/pe_get_image_entry_point_addr.c b/src/headers/pe_get_image_entry_point_addr.c index d0b222a..9e197b8 100644 --- a/src/headers/pe_get_image_entry_point_addr.c +++ b/src/headers/pe_get_image_entry_point_addr.c @@ -23,11 +23,11 @@ void * pe_get_image_entry_point_addr(const void * base) switch (*magic) { case PE_MAGIC_PE32: - rva = (uint32_t *)hdr->opt_hdr_32.entry_point; + rva = (uint32_t *)hdr->opt_hdr_32.coh_entry_point; break; case PE_MAGIC_PE32_PLUS: - rva = (uint32_t *)hdr->opt_hdr_64.entry_point; + rva = (uint32_t *)hdr->opt_hdr_64.coh_entry_point; break; default: diff --git a/src/headers/pe_get_image_section_tbl_addr.c b/src/headers/pe_get_image_section_tbl_addr.c index 3eb8188..92a2f78 100644 --- a/src/headers/pe_get_image_section_tbl_addr.c +++ b/src/headers/pe_get_image_section_tbl_addr.c @@ -23,7 +23,7 @@ struct pe_raw_sec_hdr * pe_get_image_section_tbl_addr(const void * base) if (!(opt = pe_get_image_opt_hdr_addr(base))) return 0; - mark = opt->opt_hdr_32.magic; + mark = opt->opt_hdr_32.coh_magic; mark += coff->cfh_size_of_opt_hdr[1] << 8; mark += coff->cfh_size_of_opt_hdr[0]; diff --git a/src/meta/pe_get_image_stack_heap_info.c b/src/meta/pe_get_image_stack_heap_info.c index 63f8380..eff7bd2 100644 --- a/src/meta/pe_get_image_stack_heap_info.c +++ b/src/meta/pe_get_image_stack_heap_info.c @@ -22,17 +22,17 @@ int pe_get_image_stack_heap_info(const void * base, struct pe_stack_heap_info * switch (*magic) { case PE_MAGIC_PE32: - stack_heap_info->size_of_stack_reserve = *(uint32_t *)hdr->opt_hdr_32.size_of_stack_reserve; - stack_heap_info->size_of_stack_commit = *(uint32_t *)hdr->opt_hdr_32.size_of_stack_commit; - stack_heap_info->size_of_heap_reserve = *(uint32_t *)hdr->opt_hdr_32.size_of_heap_reserve; - stack_heap_info->size_of_heap_commit = *(uint32_t *)hdr->opt_hdr_32.size_of_heap_commit; + stack_heap_info->size_of_stack_reserve = *(uint32_t *)hdr->opt_hdr_32.coh_size_of_stack_reserve; + stack_heap_info->size_of_stack_commit = *(uint32_t *)hdr->opt_hdr_32.coh_size_of_stack_commit; + stack_heap_info->size_of_heap_reserve = *(uint32_t *)hdr->opt_hdr_32.coh_size_of_heap_reserve; + stack_heap_info->size_of_heap_commit = *(uint32_t *)hdr->opt_hdr_32.coh_size_of_heap_commit; break; case PE_MAGIC_PE32_PLUS: - stack_heap_info->size_of_stack_reserve = *(size_t *)hdr->opt_hdr_64.size_of_stack_reserve; - stack_heap_info->size_of_stack_commit = *(size_t *)hdr->opt_hdr_64.size_of_stack_commit; - stack_heap_info->size_of_heap_reserve = *(size_t *)hdr->opt_hdr_64.size_of_heap_reserve; - stack_heap_info->size_of_heap_commit = *(size_t *)hdr->opt_hdr_64.size_of_heap_commit; + stack_heap_info->size_of_stack_reserve = *(size_t *)hdr->opt_hdr_64.coh_size_of_stack_reserve; + stack_heap_info->size_of_stack_commit = *(size_t *)hdr->opt_hdr_64.coh_size_of_stack_commit; + stack_heap_info->size_of_heap_reserve = *(size_t *)hdr->opt_hdr_64.coh_size_of_heap_reserve; + stack_heap_info->size_of_heap_commit = *(size_t *)hdr->opt_hdr_64.coh_size_of_heap_commit; break; default: |