winedbg: Use dbghelp extended module info.

To pickup module's data model. Signed-off-by: Eric Pouech <epouech@codeweavers.com>

winedbg: Use dbghelp extended module info.
8a940497 · Eric Pouech · Alexandre Julliard · 6b2a3dcd · 8a940497
Commit 8a940497 authored Nov 24, 2023 by Eric Pouech Committed by Alexandre Julliard Nov 24, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

types.c programs/winedbg/types.c +3 -6

No files found.
--- 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;
+        struct dhext_module_information wmi;
-        DWORD opt = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE);
-        mi.SizeOfStruct = sizeof(mi);
+        if (wine_get_module_information(dbg_curr_process->handle, modaddr, &wmi, sizeof(wmi)) &&
-        if (SymGetModuleInfoW64(dbg_curr_process->handle, modaddr, &mi) &&
+            wmi.type != DMT_PE)
-            (wcsstr(mi.ModuleName, L".so") || wcsstr(mi.ModuleName, L"<")))
            model = lp64_data_model;
        else
            model = llp64_data_model;
-        SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt);
    }
    return model;
 }