Changeset 92245 in vbox for trunk

Timestamp:

Nov 5, 2021 11:40:02 PM (3 years ago)

Author:

vboxsync

Message:

IPRT/rtR3WinUnhandledXcptFilter: Log the PID and command line too.

File:

• trunk/src/VBox/Runtime/r3/win/init-win.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/win/init-win.cpp

@@ -43 +43 @@
 #include <iprt/log.h>
 #include <iprt/param.h>
+#include <iprt/process.h>
 #include <iprt/string.h>
 #include <iprt/thread.h>
@@ -574 +575 @@
     if (pLogger)
     {
-        RTLogLogger(pLogger, NULL, "\n!!! rtR3WinUnhandledXcptFilter caught an exception on thread %p!!!\n", RTThreadNativeSelf());
+        RTLogLogger(pLogger, NULL, "\n!!! rtR3WinUnhandledXcptFilter caught an exception on thread %p in %u !!!\n",
+                    RTThreadNativeSelf(), RTProcSelf());
 
         /*
@@ -800 +802 @@
                 }
             }
+
+            /*
+             * Dump the command line if we have one. We do this last in case it crashes.
+             */
+            PRTL_USER_PROCESS_PARAMETERS pProcParams = pPeb->ProcessParameters;
+            if (RT_VALID_PTR(pProcParams))
+            {
+                if (RT_VALID_PTR(pProcParams->CommandLine.Buffer)
+                    && pProcParams->CommandLine.Length > 0
+                    && pProcParams->CommandLine.Length <= pProcParams->CommandLine.MaximumLength
+                    && !(pProcParams->CommandLine.Length & 1)
+                    && !(pProcParams->CommandLine.MaximumLength & 1))
+                    RTLogLogger(pLogger, NULL, "PEB/CommandLine: %.*ls\n",
+                                pProcParams->CommandLine.Length / sizeof(RTUTF16), pProcParams->CommandLine.Buffer);
+            }
         }
     }