exchndl: Dump the module versions at the end of the report.

So it doesn't clutter the stack back trace.
jrfonseca · Jun 16, 2015 · a36b428 · a36b428
1 parent 236befe
commit a36b428
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 15 deletions.
diff --git a/src/common/log.c b/src/common/log.c
@@ -23,6 +23,7 @@
 #include <psapi.h>
 #include <dbghelp.h>
 #include <ntstatus.h>
+#include <tlhelp32.h>
 
 #include <ctype.h>
 #include <stdio.h>
@@ -81,8 +82,6 @@ int lprintf(const char * format, ...)
 static BOOL
 dumpSourceCode(LPCTSTR lpFileName, DWORD dwLineNumber);
 
-static BOOL
-getModuleVersionInfo(LPCTSTR szModule, DWORD *dwVInfo);
 
 #define MAX_SYM_NAME_SIZE 512
 
@@ -289,19 +288,7 @@ dumpStack(HANDLE hProcess, HANDLE hThread,
         if (hModule &&
             GetModuleFileNameEx(hProcess, hModule, szModule, MAX_PATH)) {
 
-            DWORD dwVInfo[4];
-            if (getModuleVersionInfo(szModule, dwVInfo)) {
-                lprintf(
-                    _T("  %s [%lu.%lu.%lu.%lu]"),
-                    getBaseName(szModule),
-                    dwVInfo[0],
-                    dwVInfo[1],
-                    dwVInfo[2],
-                    dwVInfo[3]
-                );
-            } else {
-                lprintf( _T("  %s"), getBaseName(szModule));
-            }
+            lprintf( _T("  %s"), getBaseName(szModule));
 
             bSymbol = GetSymFromAddr(hProcess, AddrPC + nudge, szSymName, MAX_SYM_NAME_SIZE);
             if (bSymbol) {
@@ -558,6 +545,7 @@ dumpSourceCode(LPCTSTR lpFileName, DWORD dwLineNumber)
     return TRUE;
 }
 
+
 static BOOL
 getModuleVersionInfo(LPCTSTR szModule, DWORD *dwVInfo)
 {
@@ -582,3 +570,38 @@ getModuleVersionInfo(LPCTSTR szModule, DWORD *dwVInfo)
     }
     return success;
 }
+
+
+void
+dumpModules(HANDLE hProcess)
+{
+
+    HANDLE hModuleSnap = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, GetProcessId(hProcess));
+    if (hModuleSnap == INVALID_HANDLE_VALUE) {
+        return;
+    }
+
+    MODULEENTRY32 me32;
+    me32.dwSize = sizeof me32;
+    if (Module32First(hModuleSnap, &me32)) {
+        do  {
+            const char *szBaseName = getBaseName(me32.szExePath);
+            DWORD dwVInfo[4];
+            if (getModuleVersionInfo(me32.szExePath, dwVInfo)) {
+                lprintf(
+                    _T("%-12s\t%lu.%lu.%lu.%lu\n"),
+                    szBaseName,
+                    dwVInfo[0],
+                    dwVInfo[1],
+                    dwVInfo[2],
+                    dwVInfo[3]
+                );
+            } else {
+                lprintf( _T("%s\n"), szBaseName);
+            }
+        } while (Module32Next(hModuleSnap, &me32));
+        lprintf("\n");
+    }
+
+    CloseHandle(hModuleSnap);
+}
diff --git a/src/common/log.h b/src/common/log.h
@@ -38,3 +38,6 @@ dumpException(HANDLE hProcess, PEXCEPTION_RECORD pExceptionRecord);
 EXTERN_C void
 dumpStack(HANDLE hProcess, HANDLE hThread,
           const CONTEXT *pContext);
+
+EXTERN_C void
+dumpModules(HANDLE hProcess);
diff --git a/src/exchndl/exchndl.c b/src/exchndl/exchndl.c
@@ -87,6 +87,8 @@ void GenerateExceptionReport(PEXCEPTION_POINTERS pExceptionInfo)
         }
     }
 
+    dumpModules(hProcess);
+
     // TODO: Use GetFileVersionInfo on kernel32.dll as recommended on
     // https://msdn.microsoft.com/en-us/library/windows/desktop/ms724429.aspx
     // for Windows 10 detection?