From 02863d5d32f2f3693d3e0fbcfa325e65420717cd Mon Sep 17 00:00:00 2001 From: midipix Date: Feb 04 2017 13:32:07 +0000 Subject: raw data: renamed struct pe_raw_coff_file_hdr --> struct pe_raw_coff_image_hdr. --- diff --git a/include/pemagine/pe_structs.h b/include/pemagine/pe_structs.h index 3c2e478..480b625 100644 --- a/include/pemagine/pe_structs.h +++ b/include/pemagine/pe_structs.h @@ -28,7 +28,7 @@ struct pe_raw_image_dos_hdr { }; -struct pe_raw_coff_file_hdr { +struct pe_raw_coff_image_hdr { unsigned char cfh_signature [0x04]; /* 0x00 */ unsigned char cfh_machine [0x02]; /* 0x04 */ unsigned char cfh_num_of_sections [0x02]; /* 0x06 */ diff --git a/include/pemagine/pemagine.h b/include/pemagine/pemagine.h index afc42c7..0edd08e 100644 --- a/include/pemagine/pemagine.h +++ b/include/pemagine/pemagine.h @@ -195,7 +195,7 @@ typedef int pe_enum_image_import_hdrs_callback( /* image: low-level api */ 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 struct pe_raw_coff_image_hdr * pe_get_image_coff_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_raw_data_dirs * pe_get_image_data_dirs_addr (const void * base); pe_api struct pe_raw_sec_hdr * pe_get_image_section_tbl_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 a4d6711..baceba3 100644 --- a/src/headers/pe_get_image_coff_hdr_addr.c +++ b/src/headers/pe_get_image_coff_hdr_addr.c @@ -10,17 +10,17 @@ #include -struct pe_raw_coff_file_hdr * pe_get_image_coff_hdr_addr(const void * base) +struct pe_raw_coff_image_hdr * pe_get_image_coff_hdr_addr(const void * base) { struct pe_raw_image_dos_hdr * dos; - struct pe_raw_coff_file_hdr * coff; + struct pe_raw_coff_image_hdr * coff; uint32_t * offset; if (!(dos = pe_get_image_dos_hdr_addr(base))) return 0; offset = (uint32_t *)(dos->dos_lfanew); - coff = (struct pe_raw_coff_file_hdr *)pe_va_from_rva(base,*offset); + coff = (struct pe_raw_coff_image_hdr *)pe_va_from_rva(base,*offset); return ((coff->cfh_signature[0] == 'P') && (coff->cfh_signature[1] == 'E') diff --git a/src/headers/pe_get_image_opt_hdr_addr.c b/src/headers/pe_get_image_opt_hdr_addr.c index 9333f8c..7bfa8fe 100644 --- a/src/headers/pe_get_image_opt_hdr_addr.c +++ b/src/headers/pe_get_image_opt_hdr_addr.c @@ -11,7 +11,7 @@ pe_api union pe_raw_opt_hdr * pe_get_image_opt_hdr_addr(const void * base) { - struct pe_raw_coff_file_hdr * coff; + struct pe_raw_coff_image_hdr * coff; void * addr; if (!(coff = pe_get_image_coff_hdr_addr(base))) diff --git a/src/headers/pe_get_image_section_tbl_addr.c b/src/headers/pe_get_image_section_tbl_addr.c index f5a7054..87ec39c 100644 --- a/src/headers/pe_get_image_section_tbl_addr.c +++ b/src/headers/pe_get_image_section_tbl_addr.c @@ -13,7 +13,7 @@ struct pe_raw_sec_hdr * pe_get_image_section_tbl_addr(const void * base) { - struct pe_raw_coff_file_hdr * coff; + struct pe_raw_coff_image_hdr * coff; union pe_raw_opt_hdr * opt; unsigned char * mark; @@ -35,7 +35,7 @@ struct pe_raw_sec_hdr * pe_get_image_named_section_addr(const void * base, const { uint16_t count; struct pe_raw_sec_hdr * hdr; - struct pe_raw_coff_file_hdr * coff; + struct pe_raw_coff_image_hdr * coff; char * ch; size_t len; uint32_t pos;