[PATCH 0/2] MR4670: Don't fail on extraneous COFF stream indexes.

[eric pouech (＠epo)]

Latests MS compiler seem to emit an extra COFF entry.
Current code is too strict into accepting only predefined set
of references.
Just relax constraint for now. Will require a proper fix after
code freeze.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4670

[PATCH 1/2] winedump: Don't fail on extra stream entry in PDB.

[Eric Pouech]

From: Eric Pouech <epouech(a)codeweavers.com>

Latest versions of MSVC use this.

Signed-off-by: Eric Pouech <epouech(a)codeweavers.com>
---
 dlls/dbghelp/msc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c
index 5e699d54e2c..a578cf7cbfa 100644
--- a/dlls/dbghelp/msc.c
+++ b/dlls/dbghelp/msc.c
@@ -3809,6 +3809,7 @@ static BOOL pdb_process_internal(const struct process* pcs,
             /* no fpo ext stream in this case */
             break;
         case sizeof(PDB_STREAM_INDEXES):
+        case sizeof(PDB_STREAM_INDEXES) + 2:
             psi = (PDB_STREAM_INDEXES*)((const char*)symbols_image + sizeof(PDB_SYMBOLS) +
                                         symbols.module_size + symbols.sectcontrib_size +
                                         symbols.segmap_size + symbols.srcmodule_size +
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/4670

[PATCH 2/2] dbghelp: Allow an extra stream index entry in PDB files.

[Eric Pouech]

From: Eric Pouech <epouech(a)codeweavers.com>

Latest MSVC version use this.

Signed-off-by: Eric Pouech <epouech(a)codeweavers.com>
---
 tools/winedump/pdb.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c
index 552fa4d8da8..adc0eadc738 100644
--- a/tools/winedump/pdb.c
+++ b/tools/winedump/pdb.c
@@ -762,6 +762,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader)
                    sidx.sections_stream);
             break;
         case sizeof(PDB_STREAM_INDEXES):
+        case sizeof(PDB_STREAM_INDEXES) + 2:
             memcpy(&sidx,
                    (const char*)symbols + sizeof(PDB_SYMBOLS) + symbols->module_size +
                    symbols->sectcontrib_size + symbols->segmap_size + symbols->srcmodule_size +
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/4670