[PATCH 0/1] MR4732: winedbg: Fix main module detection in 'info share' command.

[eric pouech (＠epo)]

Signed-off-by: Eric Pouech <epouech(a)codeweavers.com>

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

[PATCH 1/1] winedbg: Fix main module detection in 'info share' command.

[Eric Pouech]

From: Eric Pouech <epouech(a)codeweavers.com>

Signed-off-by: Eric Pouech <epouech(a)codeweavers.com>
---
 programs/winedbg/info.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c
index f97b122ed5b..5e724afc0ed 100644
--- a/programs/winedbg/info.c
+++ b/programs/winedbg/info.c
@@ -287,7 +287,14 @@ void info_win32_module(DWORD64 base, BOOL multi_machine)
 
     if (!im.num_used) return;
 
-    machine = im.modules[0].mi.MachineType;
+    /* main module is the first PE module in enumeration */
+    for (i = 0; i < im.num_used; i++)
+        if (im.modules[i].ext_module_info.type == DMT_PE)
+        {
+            machine = im.modules[i].mi.MachineType;
+            break;
+        }
+    if (i == im.num_used) machine = IMAGE_FILE_MACHINE_UNKNOWN;
     qsort(im.modules, im.num_used, sizeof(im.modules[0]), module_compare);
 
     if (multi_machine)
-- 
GitLab

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

[PATCH 1/1] winedbg: Fix main module detection in 'info share' command.

[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=141445

Your paranoid android.


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

dinput:
device8.c:2237: Test failed: 0x700: got key_state[0] 0