Eric Pouech : winedump: Better detect whether IPI stream is present.
Alexandre Julliard
julliard at winehq.org
Wed Nov 10 15:34:48 CST 2021
Module: wine
Branch: master
Commit: 97c3c41732ffa3ac876378e96a42f5e38342f377
URL: https://source.winehq.org/git/wine.git/?a=commit;h=97c3c41732ffa3ac876378e96a42f5e38342f377
Author: Eric Pouech <eric.pouech at gmail.com>
Date: Wed Nov 10 16:42:14 2021 +0100
winedump: Better detect whether IPI stream is present.
Old version of PDB files can have a stream #4 which is not an IPI stream
Available documentation isn't 100% clear about when IPI has been
introduced.
So decide that IPI is present when header of stream looks like a type
stream header.
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
tools/winedump/pdb.c | 37 ++++++++++++++++++++++++++++++++-----
1 file changed, 32 insertions(+), 5 deletions(-)
diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c
index ed4877cd10a..958a13f5e1c 100644
--- a/tools/winedump/pdb.c
+++ b/tools/winedump/pdb.c
@@ -54,6 +54,21 @@ struct pdb_reader
DWORD file_used[1024];
};
+static inline BOOL has_file_been_read(struct pdb_reader* reader, unsigned file_nr)
+{
+ return reader->file_used[file_nr / 32] & (1 << (file_nr % 32));
+}
+
+static inline void mark_file_been_read(struct pdb_reader* reader, unsigned file_nr)
+{
+ reader->file_used[file_nr / 32] |= 1 << (file_nr % 32);
+}
+
+static inline void clear_file_been_read(struct pdb_reader* reader, unsigned file_nr)
+{
+ reader->file_used[file_nr / 32] &= ~(1 << (file_nr % 32));
+}
+
static void* pdb_jg_read(const struct PDB_JG_HEADER* pdb, const WORD* block_list, int size)
{
int i, nBlocks;
@@ -78,7 +93,7 @@ static void* pdb_jg_read_file(struct pdb_reader* reader, DWORD file_nr)
if (!reader->u.jg.toc || file_nr >= reader->u.jg.toc->num_files) return NULL;
- reader->file_used[file_nr / 32] |= 1 << (file_nr % 32);
+ mark_file_been_read(reader, file_nr);
if (reader->u.jg.toc->file[file_nr].size == 0 ||
reader->u.jg.toc->file[file_nr].size == 0xFFFFFFFF)
return NULL;
@@ -125,7 +140,7 @@ static void pdb_exit(struct pdb_reader* reader)
for (i = 0; i < pdb_get_num_files(reader); i++)
{
- if (reader->file_used[i / 32] & (1 << (i % 32))) continue;
+ if (has_file_been_read(reader, i)) continue;
file = reader->read_file(reader, i);
if (!file) continue;
@@ -615,7 +630,14 @@ static void pdb_dump_types_hash(struct pdb_reader* reader, unsigned file, const
static void pdb_dump_types(struct pdb_reader* reader, unsigned strmidx, const char* strmname)
{
PDB_TYPES* types = NULL;
+ BOOL used = has_file_been_read(reader, strmidx);
+ if (pdb_get_file_size(reader, strmidx) < sizeof(*types))
+ {
+ if (strmidx == 2)
+ printf("-Too small type header\n");
+ return;
+ }
types = reader->read_file(reader, strmidx);
if (!types) return;
@@ -628,7 +650,12 @@ static void pdb_dump_types(struct pdb_reader* reader, unsigned strmidx, const ch
case 20040203: /* VC 8.0 */
break;
default:
- printf("-Unknown type info version %d\n", types->version);
+ /* IPI stream is not always present in older PDB files */
+ if (strmidx == 2)
+ printf("-Unknown type info version %d\n", types->version);
+ free(types);
+ if (used) clear_file_been_read(reader, strmidx);
+ return;
}
/* Read type table */
@@ -870,7 +897,7 @@ static void* pdb_ds_read_file(struct pdb_reader* reader, DWORD file_number)
if (!reader->u.ds.toc || file_number >= reader->u.ds.toc->num_files) return NULL;
- reader->file_used[file_number / 32] |= 1 << (file_number % 32);
+ mark_file_been_read(reader, file_number);
if (reader->u.ds.toc->file_size[file_number] == 0 ||
reader->u.ds.toc->file_size[file_number] == 0xFFFFFFFF)
return NULL;
@@ -932,7 +959,7 @@ static void pdb_ds_dump(void)
* - segments
* - extended FPO data
*/
- reader.file_used[0] |= 1; /* mark stream #0 as read */
+ mark_file_been_read(&reader, 0); /* mark stream #0 as read */
reader.u.ds.root = reader.read_file(&reader, 1);
if (reader.u.ds.root)
{
More information about the wine-cvs
mailing list