[PATCH v3 2/2] dbghelp: Initialize new structure members

[Alistair Leslie-Hughes]

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
 dlls/dbghelp/coff.c   | 2 ++
 dlls/dbghelp/dwarf.c  | 2 ++
 dlls/dbghelp/module.c | 4 ++++
 dlls/dbghelp/msc.c    | 4 ++++
 dlls/dbghelp/stabs.c  | 2 ++
 5 files changed, 14 insertions(+)

diff --git a/dlls/dbghelp/coff.c b/dlls/dbghelp/coff.c
index 285182f682a..769e2c54196 100644
--- a/dlls/dbghelp/coff.c
+++ b/dlls/dbghelp/coff.c
@@ -452,6 +452,8 @@ DECLSPEC_HIDDEN BOOL coff_process_info(const struct msc_debug_info* msc_dbg)
         msc_dbg->module->module.TypeInfo = FALSE;
         msc_dbg->module->module.SourceIndexed = TRUE;
         msc_dbg->module->module.Publics = TRUE;
+        msc_dbg->module->module.MachineType = 0;
+        msc_dbg->module->module.Reserved = 0;
         ret = TRUE;
     }
 
diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c
index 53274c4f597..b9726f5f4c8 100644
--- a/dlls/dbghelp/dwarf.c
+++ b/dlls/dbghelp/dwarf.c
@@ -3561,6 +3561,8 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset,
     dwarf2_modfmt->module->module.TypeInfo = TRUE;
     dwarf2_modfmt->module->module.SourceIndexed = TRUE;
     dwarf2_modfmt->module->module.Publics = TRUE;
+    dwarf2_modfmt->module->module.MachineType = 0;
+    dwarf2_modfmt->module->module.Reserved = 0;
 
     /* set the word_size for eh_frame parsing */
     dwarf2_modfmt->u.dwarf2_info->word_size = fmap->addr_size / 8;
diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c
index cadb285accb..247aadcef0e 100644
--- a/dlls/dbghelp/module.c
+++ b/dlls/dbghelp/module.c
@@ -207,6 +207,8 @@ struct module* module_new(struct process* pcs, const WCHAR* name,
     module->module.TypeInfo = FALSE;
     module->module.SourceIndexed = FALSE;
     module->module.Publics = FALSE;
+    module->module.MachineType = 0;
+    module->module.Reserved = 0;
 
     module->reloc_delta       = 0;
     module->type              = type;
@@ -1201,6 +1203,8 @@ BOOL  WINAPI SymGetModuleInfo64(HANDLE hProcess, DWORD64 dwAddr,
     mi64.TypeInfo      = miw64.TypeInfo;
     mi64.SourceIndexed = miw64.SourceIndexed;
     mi64.Publics       = miw64.Publics;
+    mi64.MachineType   = miw64.MachineType;
+    mi64.Reserved      = miw64.Reserved;
 
     memcpy(ModuleInfo, &mi64, ModuleInfo->SizeOfStruct);
 
diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c
index b6811ea97f5..51edcaa2210 100644
--- a/dlls/dbghelp/msc.c
+++ b/dlls/dbghelp/msc.c
@@ -2901,6 +2901,8 @@ static BOOL pdb_process_file(const struct process* pcs,
         msc_dbg->module->module.TypeInfo = TRUE;
         msc_dbg->module->module.SourceIndexed = TRUE;
         msc_dbg->module->module.Publics = TRUE;
+        msc_dbg->module->module.MachineType = 0;
+        msc_dbg->module->module.Reserved = 0;
     }
     else
     {
@@ -3343,6 +3345,8 @@ static BOOL codeview_process_info(const struct process* pcs,
         msc_dbg->module->module.TypeInfo = TRUE;
         msc_dbg->module->module.SourceIndexed = TRUE;
         msc_dbg->module->module.Publics = TRUE;
+        msc_dbg->module->module.MachineType = 0;
+        msc_dbg->module->module.Reserved = 0;
         codeview_clear_type_table();
         ret = TRUE;
         break;
diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c
index 517299897c4..e6aacc063aa 100644
--- a/dlls/dbghelp/stabs.c
+++ b/dlls/dbghelp/stabs.c
@@ -1676,6 +1676,8 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset,
     module->module.TypeInfo = TRUE;
     module->module.SourceIndexed = TRUE;
     module->module.Publics = TRUE;
+    module->module.MachineType   = 0;
+    module->module.Reserved      = 0;
 done:
     HeapFree(GetProcessHeap(), 0, stabbuff);
     stabs_free_includes();
-- 
2.30.2

[Nikolay Sivov]

On 7/16/21 8:38 AM, Alistair Leslie-Hughes wrote:
> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
> ---
>  dlls/dbghelp/coff.c   | 2 ++
>  dlls/dbghelp/dwarf.c  | 2 ++
>  dlls/dbghelp/module.c | 4 ++++
>  dlls/dbghelp/msc.c    | 4 ++++
>  dlls/dbghelp/stabs.c  | 2 ++
>  5 files changed, 14 insertions(+)
> Are you sure that it's not enough to change just module_new() ?