[PATCH 0/1] MR5315: dbghelp: Fix PDB processing using the FPO stream instead of FPOEXT

[Kyrylo Babikov (＠dank_meme)]

Since wine 9.3 (particularly [this commit](https://gitlab.winehq.org/wine/wine/-/commit/552bc893e17a0e046c2f598e0f18dc3...)), `pdb_process_internal` mistakenly sets `fpoext_stream` to the FPO stream (`sub_streams[PDB_SIDX_FPO]`) instead of the FPOEXT stream (`sub_streams[PDB_SIDX_FPOEXT]`), causing the PDB file to be improperly processed.

This merge request fixes that oversight.

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

[PATCH 1/1] dbghelp: Fix PDB processing using the FPO stream instead of FPOEXT

[Kyrylo Babikov]

From: Kyrylo Babikov <kirill.babikov28(a)gmail.com>

---
 dlls/dbghelp/msc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c
index d7c22075428..b14af240302 100644
--- a/dlls/dbghelp/msc.c
+++ b/dlls/dbghelp/msc.c
@@ -3787,8 +3787,8 @@ static BOOL pdb_process_internal(const struct process *pcs,
                                               symbols.module_size + symbols.sectcontrib_size +
                                               symbols.segmap_size + symbols.srcmodule_size +
                                               symbols.pdbimport_size + symbols.unknown2_size);
-        if (PDB_SIDX_FPO < num_sub_streams)
-            pdb_file->fpoext_stream = sub_streams[PDB_SIDX_FPO];
+        if (PDB_SIDX_FPOEXT < num_sub_streams)
+            pdb_file->fpoext_stream = sub_streams[PDB_SIDX_FPOEXT];
 
         files_image = pdb_read_strings(pdb_file);
 
-- 
GitLab

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

[PATCH 1/1] dbghelp: Fix PDB processing using the FPO stream instead of FPOEXT

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=144073

Your paranoid android.


=== debian11b (64 bit WoW report) ===

d3dx10_34:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001239FE0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 0000000001239D10.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011D5530.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011D5700.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 0000000001239D10.

d3dx10_35:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011A4690.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011A4860.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011D18E0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011D1AB0.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D55F0.

d3dx10_36:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001239EC0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 0000000001239EC0.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011D56C0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 0000000001239EC0.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011B5A20.

d3dx10_37:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001239D50.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011E3730.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011E3900.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011F0930.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011F0930.

d3dx10_38:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011D5860.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011D5860.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011E39B0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011B5D90.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011B5F60.

d3dx10_39:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011A45D0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011A47A0.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011A4970.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011A4B40.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D55F0.

d3dx10_40:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011B6030.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011BCAB0.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011A4690.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011A4B40.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011958C0.

d3dx10_41:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011A4A60.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011B5E50.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011B5E50.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011C3440.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011C3610.

d3dx10_42:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001239DE0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011A4A60.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011D5720.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011BB560.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011B6050.

d3dx10_43:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011D5B20.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011D1AF0.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011B6030.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 0000000001195800.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011BCAB0.

[PATCH 0/1] MR5315: dbghelp: Fix PDB processing using the FPO stream instead of FPOEXT - approved

[eric pouech (＠epo)]

This merge request was approved by eric pouech.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5315