Eric Pouech : winedbg: Use dbghelp extended module info.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8a94049770ac542346b85527a8da1309e6c9d71f
URL:    https://gitlab.winehq.org/wine/wine/-/commit/8a94049770ac542346b85527a8da130...

Author: Eric Pouech 
Date:   Fri Nov 24 15:33:39 2023 +0100

winedbg: Use dbghelp extended module info.

To pickup module's data model.

Signed-off-by: Eric Pouech

---

programs/winedbg/types.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c
index 44872a7edad..ff1b68bd33c 100644
--- a/programs/winedbg/types.c
+++ b/programs/winedbg/types.c
@@ -978,16 +978,13 @@ static const struct data_model* get_data_model(DWORD64 modaddr)
     else if (ADDRSIZE == 4) model = ilp32_data_model;
     else
     {
-        IMAGEHLP_MODULEW64 mi;
-        DWORD opt = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE);
+        struct dhext_module_information wmi;

-        mi.SizeOfStruct = sizeof(mi);
-        if (SymGetModuleInfoW64(dbg_curr_process->handle, modaddr, &mi) &&
-            (wcsstr(mi.ModuleName, L".so") || wcsstr(mi.ModuleName, L"<")))
+        if (wine_get_module_information(dbg_curr_process->handle, modaddr, &wmi, sizeof(wmi)) &&
+            wmi.type != DMT_PE)
             model = lp64_data_model;
         else
             model = llp64_data_model;
-        SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt);
     }
     return model;
 }