From: Eric Pouech eric.pouech@gmail.com
We were using either _size or _len depending on which one.
Signed-off-by: Eric Pouech eric.pouech@gmail.com --- dlls/dbghelp/msc.c | 18 ++++++------ include/wine/mscvpdb.h | 12 ++++---- tools/winedump/pdb.c | 64 +++++++++++++++++++++--------------------- 3 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 1b998ab5e36..66b88e3de07 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -782,8 +782,8 @@ static BOOL codeview_type_extract_name(const union codeview_type* cvtype,
static unsigned pdb_read_hash_value(const struct codeview_type_parse* ctp, unsigned idx) { - const void* where = ctp->hash_stream + ctp->header.hash_offset + (idx - ctp->header.first_index) * ctp->header.hash_size; - switch (ctp->header.hash_size) + const void* where = ctp->hash_stream + ctp->header.hash_offset + (idx - ctp->header.first_index) * ctp->header.hash_value_size; + switch (ctp->header.hash_value_size) { case 2: return *(unsigned short*)where; case 4: return *(unsigned*)where; @@ -2888,16 +2888,16 @@ static BOOL codeview_snarf_sym_hashtable(const struct msc_debug_info* msc_dbg, c if (hashsize < sizeof(DBI_HASH_HEADER) || hash_hdr->signature != 0xFFFFFFFF || hash_hdr->version != 0xeffe0000 + 19990810 || - (hash_hdr->size_hash_records % sizeof(DBI_HASH_RECORD)) != 0 || - sizeof(DBI_HASH_HEADER) + hash_hdr->size_hash_records + DBI_BITMAP_HASH_SIZE > hashsize || - (hashsize - (sizeof(DBI_HASH_HEADER) + hash_hdr->size_hash_records + DBI_BITMAP_HASH_SIZE)) % sizeof(unsigned)) + (hash_hdr->hash_records_size % sizeof(DBI_HASH_RECORD)) != 0 || + sizeof(DBI_HASH_HEADER) + hash_hdr->hash_records_size + DBI_BITMAP_HASH_SIZE > hashsize || + (hashsize - (sizeof(DBI_HASH_HEADER) + hash_hdr->hash_records_size + DBI_BITMAP_HASH_SIZE)) % sizeof(unsigned)) { FIXME("Incorrect hash structure\n"); return FALSE; }
hr = (DBI_HASH_RECORD*)(hash_hdr + 1); - num_hash_records = hash_hdr->size_hash_records / sizeof(DBI_HASH_RECORD); + num_hash_records = hash_hdr->hash_records_size / sizeof(DBI_HASH_RECORD);
/* Only iterate over the records listed in the hash table. * We assume that records present in stream, but not listed in hash table, are @@ -3387,9 +3387,9 @@ static BOOL pdb_init_type_parse(const struct msc_debug_info* msc_dbg, ERR("-Unknown type info version %d\n", ctp->header.version); return FALSE; } - if (ctp->header.hash_size != 2 && ctp->header.hash_size != 4) + if (ctp->header.hash_value_size != 2 && ctp->header.hash_value_size != 4) { - ERR("-Unsupported hash of size %u\n", ctp->header.hash_size); + ERR("-Unsupported hash of size %u\n", ctp->header.hash_value_size); return FALSE; } ctp->hash_stream = pdb_read_file(pdb_file, ctp->header.hash_file); @@ -3429,7 +3429,7 @@ static BOOL pdb_init_type_parse(const struct msc_debug_info* msc_dbg, /* parse the remap table * => move listed type_id at first position of their hash buckets so that we force remap to them */ - if (ctp->header.type_remap_len) + if (ctp->header.type_remap_size) { const unsigned* remap = (const unsigned*)((const BYTE*)ctp->hash_stream + ctp->header.type_remap_offset); unsigned i, capa, count_present; diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 10d1438e0ea..85b115876c6 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -2454,14 +2454,14 @@ typedef struct _PDB_TYPES unsigned int type_size; unsigned short hash_file; unsigned short pad; - unsigned int hash_size; + unsigned int hash_value_size; unsigned int hash_num_buckets; unsigned int hash_offset; - unsigned int hash_len; + unsigned int hash_size; unsigned int search_offset; - unsigned int search_len; + unsigned int search_size; unsigned int type_remap_offset; - unsigned int type_remap_len; + unsigned int type_remap_size; } PDB_TYPES, *PPDB_TYPES;
typedef struct _PDB_SYMBOL_RANGE @@ -2631,11 +2631,11 @@ typedef struct { unsigned signature; unsigned version; - unsigned size_hash_records; + unsigned hash_records_size; unsigned unknown; } DBI_HASH_HEADER; /* This header is followed by: - * - DBI_HASH_RECORDS (on hdr:size_hash_records bytes) + * - DBI_HASH_RECORDS (on hdr:hash_records_size bytes) * - a bitmap of DBI_MAX_HASH + 1 entries (on DBI_BITMAP_HASH_SIZE bytes) * - a table (one entry per present bit in bitmap) as index into hdr:num_records */ diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 3bf4f7a0606..5687766fd1e 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -240,25 +240,25 @@ static void dump_dbi_hash_table(const BYTE* root, unsigned size, const char* nam printf("%s%s symbols hash:\n", pfx, name); printf("%s\tSignature: 0x%x\n", pfx, hdr->signature); printf("%s\tVersion: 0x%x (%u)\n", pfx, hdr->version, hdr->version - 0xeffe0000); - printf("%s\tSize of hash records: %u\n", pfx, hdr->size_hash_records); + printf("%s\tSize of hash records: %u\n", pfx, hdr->hash_records_size); printf("%s\tUnknown: %u\n", pfx, hdr->unknown);
if (hdr->signature != 0xFFFFFFFF || hdr->version != 0xeffe0000 + 19990810 || - (hdr->size_hash_records % sizeof(DBI_HASH_RECORD)) != 0 || - sizeof(DBI_HASH_HEADER) + hdr->size_hash_records + DBI_BITMAP_HASH_SIZE > size || - (size - (sizeof(DBI_HASH_HEADER) + hdr->size_hash_records + DBI_BITMAP_HASH_SIZE)) % sizeof(unsigned)) + (hdr->hash_records_size % sizeof(DBI_HASH_RECORD)) != 0 || + sizeof(DBI_HASH_HEADER) + hdr->hash_records_size + DBI_BITMAP_HASH_SIZE > size || + (size - (sizeof(DBI_HASH_HEADER) + hdr->hash_records_size + DBI_BITMAP_HASH_SIZE)) % sizeof(unsigned)) { printf("%s\t\tIncorrect hash structure\n", pfx); } else { unsigned i; - unsigned num_hash_records = hdr->size_hash_records / sizeof(DBI_HASH_RECORD); + unsigned num_hash_records = hdr->hash_records_size / sizeof(DBI_HASH_RECORD); const DBI_HASH_RECORD* hr = (const DBI_HASH_RECORD*)(hdr + 1); - unsigned* bitmap = (unsigned*)((char*)(hdr + 1) + hdr->size_hash_records); - unsigned* buckets = (unsigned*)((char*)(hdr + 1) + hdr->size_hash_records + DBI_BITMAP_HASH_SIZE); - unsigned index, last_index = (size - (sizeof(DBI_HASH_HEADER) + hdr->size_hash_records + DBI_BITMAP_HASH_SIZE)) / sizeof(unsigned); + unsigned* bitmap = (unsigned*)((char*)(hdr + 1) + hdr->hash_records_size); + unsigned* buckets = (unsigned*)((char*)(hdr + 1) + hdr->hash_records_size + DBI_BITMAP_HASH_SIZE); + unsigned index, last_index = (size - (sizeof(DBI_HASH_HEADER) + hdr->hash_records_size + DBI_BITMAP_HASH_SIZE)) / sizeof(unsigned);
/* Yes, offsets for accessiong hr[] are stored as multiple of 12; and not * as multiple of sizeof(*hr) = 8 as one might expect. @@ -279,10 +279,10 @@ static void dump_dbi_hash_table(const BYTE* root, unsigned size, const char* nam printf("%s\t[%u] <<empty>>\n", pfx, i); } /* shouldn't happen */ - if (sizeof(DBI_HASH_HEADER) + hdr->size_hash_records + DBI_BITMAP_HASH_SIZE + index * sizeof(unsigned) > size) + if (sizeof(DBI_HASH_HEADER) + hdr->hash_records_size + DBI_BITMAP_HASH_SIZE + index * sizeof(unsigned) > size) { printf("%s-- left over %u bytes\n", pfx, - size - (unsigned)(sizeof(DBI_HASH_HEADER) + hdr->size_hash_records + DBI_BITMAP_HASH_SIZE + index * sizeof(unsigned))); + size - (unsigned)(sizeof(DBI_HASH_HEADER) + hdr->hash_records_size + DBI_BITMAP_HASH_SIZE + index * sizeof(unsigned))); } } } @@ -727,10 +727,10 @@ static void pdb_dump_types_hash(struct pdb_reader* reader, const PDB_TYPES* type
printf("Types (%s) hash:\n", strmname); strmsize = pdb_get_file_size(reader, types->hash_file); - if (types->hash_offset + types->hash_len > strmsize || - (types->last_index - types->first_index) * types->hash_size != types->hash_len || - types->search_offset + types->search_len > strmsize || - types->type_remap_offset + types->type_remap_len > strmsize) + if (types->hash_offset + types->hash_size > strmsize || + (types->last_index - types->first_index) * types->hash_value_size != types->hash_size || + types->search_offset + types->search_size > strmsize || + types->type_remap_offset + types->type_remap_size > strmsize) { printf("\nIncoherent sizes... skipping\n"); return; @@ -739,7 +739,7 @@ static void pdb_dump_types_hash(struct pdb_reader* reader, const PDB_TYPES* type for (i = types->first_index; i < types->last_index; i++) { printf("\t\t%08x => ", i); - pdb_dump_hash_value((const BYTE*)hash + types->hash_offset + (i - types->first_index) * types->hash_size, types->hash_size); + pdb_dump_hash_value((const BYTE*)hash + types->hash_offset + (i - types->first_index) * types->hash_value_size, types->hash_value_size); printf("\n"); } /* print collisions in hash table (if any) */ @@ -749,7 +749,7 @@ static void pdb_dump_types_hash(struct pdb_reader* reader, const PDB_TYPES* type unsigned head_printed = 0;
collision_arg.hash = (const BYTE*)hash + types->hash_offset; - collision_arg.hash_size = types->hash_size; + collision_arg.hash_size = types->hash_value_size;
for (i = 0; i < types->last_index - types->first_index; i++) collision[i] = i; qsort(collision, types->last_index - types->first_index, sizeof(unsigned), collision_compar); @@ -757,9 +757,9 @@ static void pdb_dump_types_hash(struct pdb_reader* reader, const PDB_TYPES* type { unsigned j; for (j = i + 1; j < types->last_index - types->first_index; j++) - if (memcmp((const BYTE*)hash + types->hash_offset + collision[i] * types->hash_size, - (const BYTE*)hash + types->hash_offset + collision[j] * types->hash_size, - types->hash_size)) + if (memcmp((const BYTE*)hash + types->hash_offset + collision[i] * types->hash_value_size, + (const BYTE*)hash + types->hash_offset + collision[j] * types->hash_value_size, + types->hash_value_size)) break; if (j > i + 1) { @@ -770,7 +770,7 @@ static void pdb_dump_types_hash(struct pdb_reader* reader, const PDB_TYPES* type head_printed = 1; } printf("\t\t\tHash "); - pdb_dump_hash_value((const BYTE*)hash + types->hash_offset + collision[i] * types->hash_size, types->hash_size); + pdb_dump_hash_value((const BYTE*)hash + types->hash_offset + collision[i] * types->hash_value_size, types->hash_value_size); printf(":"); for (k = i; k < j; k++) printf(" %x", types->first_index + collision[k]); @@ -782,11 +782,11 @@ static void pdb_dump_types_hash(struct pdb_reader* reader, const PDB_TYPES* type } printf("\n\tIndexes => offsets:\n"); table = (const unsigned*)((const BYTE*)hash + types->search_offset); - for (i = 0; i < types->search_len / (2 * sizeof(unsigned)); i += 2) + for (i = 0; i < types->search_size / (2 * sizeof(unsigned)); i += 2) { printf("\t\t%08x => %08x\n", table[2 * i + 0], table[2 * i + 1]); } - if (types->type_remap_len && (strbase = read_string_table(reader))) + if (types->type_remap_size && (strbase = read_string_table(reader))) { unsigned num, capa, count_present, count_deleted; const unsigned* present_bitset; @@ -823,8 +823,8 @@ static void pdb_dump_types_hash(struct pdb_reader* reader, const PDB_TYPES* type if (is_bit_set(present_bitset, count_present, i)) { printf(" %s => ", pdb_get_string_table_entry(strbase, *table++)); - pdb_dump_hash_value((const BYTE*)table, types->hash_size); - table = (const unsigned*)((const BYTE*)table + types->hash_size); + pdb_dump_hash_value((const BYTE*)table, types->hash_value_size); + table = (const unsigned*)((const BYTE*)table + types->hash_value_size); } printf("\n"); } @@ -875,14 +875,14 @@ static void pdb_dump_types(struct pdb_reader* reader, unsigned strmidx, const ch "\ttype_size: %x\n" "\thash_file: %x\n" "\tpad: %x\n" - "\thash_size: %x\n" + "\thash_value_size: %x\n" "\thash_buckets %x\n" "\thash_offset: %x\n" - "\thash_len: %x\n" + "\thash_size: %x\n" "\tsearch_offset: %x\n" - "\tsearch_len: %x\n" + "\tsearch_size: %x\n" "\ttype_remap_offset: %x\n" - "\ttype_remap_len: %x\n", + "\ttype_remap_size: %x\n", strmname, types->version, types->type_offset, @@ -891,14 +891,14 @@ static void pdb_dump_types(struct pdb_reader* reader, unsigned strmidx, const ch types->type_size, types->hash_file, types->pad, - types->hash_size, + types->hash_value_size, types->hash_num_buckets, types->hash_offset, - types->hash_len, + types->hash_size, types->search_offset, - types->search_len, + types->search_size, types->type_remap_offset, - types->type_remap_len); + types->type_remap_size); codeview_dump_types_from_block((const char*)types + types->type_offset, types->type_size); pdb_dump_types_hash(reader, types, strmname); free(types);