[PATCH 0/1] MR4708: winedbg: Retrieve architecture from process.

[Bernhard Übelacker]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56048

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

[PATCH 1/1] winedbg: Retrieve architecture from process.

[Bernhard Übelacker]

From: Bernhard Übelacker <bernhardu(a)mailbox.org>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56048
---
 programs/winedbg/info.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c
index d95b286454a..16859585d3a 100644
--- a/programs/winedbg/info.c
+++ b/programs/winedbg/info.c
@@ -266,6 +266,7 @@ void info_win32_module(DWORD64 base, BOOL multi_machine)
     struct info_modules im;
     UINT                i, j, num_printed = 0;
     BOOL                opt;
+    USHORT              current, native;
     DWORD               machine;
     BOOL                has_missing_filename = FALSE;
 
@@ -288,7 +289,8 @@ void info_win32_module(DWORD64 base, BOOL multi_machine)
     if (!im.num_used) return;
 
     qsort(im.modules, im.num_used, sizeof(im.modules[0]), module_compare);
-    machine = im.modules[0].mi.MachineType;
+    RtlWow64GetProcessMachines( dbg_curr_process->handle, ¤t, &native );
+    machine = current ? current : native;
 
     if (multi_machine)
         dbg_printf("%-8s%-40s%-16s%-16sName (%d modules)\n", "Module", "Address", "Machine", "Debug info", im.num_used);
-- 
GitLab

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

[eric pouech (＠epo)]

didn't test it though, but likely setting the machine before calling qsort should solve this

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4708#note_56190

[PATCH 0/1] MR4708: winedbg: Retrieve module architecture before sorting.

[Bernhard Übelacker]

Yes, taking architecture before sorting is working too. I updated the patch and this is enough to work with AnomalyDX11AVX.exe.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4708#note_56193

[PATCH 0/1] MR4708: winedbg: Retrieve module architecture before sorting.

[eric pouech (＠epo)]

thanks for changing it

(I forgot to mention that info share can be called on a non running process, eg when reloading a minidump), so there's no guarantee that the hprocess is a valid process handle)

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4708#note_56200