Print the exception code and the faulting address, if the address is available.

svn path=/trunk/; revision=17598

diff --git a/reactos/lib/kernel32/except/except.c b/reactos/lib/kernel32/except/except.c
index 00a7ef2..505a71b 100644 (file)
--- a/reactos/lib/kernel32/except/except.c
+++ b/reactos/lib/kernel32/except/except.c
@@ -164,8 +164,13 @@ UnhandledExceptionFilter(struct _EXCEPTION_POINTERS *ExceptionInfo)
 
       /* Print a stack trace. */
       DbgPrint("Unhandled exception\n");
-      DbgPrint("Address:\n");
-      DbgPrint("   %8x   %s\n",
+      DbgPrint("ExceptionCode:    %8x\n", ExceptionInfo->ExceptionRecord->ExceptionCode);
+      if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION &&
+          ExceptionInfo->ExceptionRecord->NumberParameters == 2)
+      {
+         DbgPrint("Faulting Address: %8x\n", ExceptionInfo->ExceptionRecord->ExceptionInformation[1]);
+      }
+      DbgPrint("Address:          %8x   %s\n",
          ExceptionInfo->ExceptionRecord->ExceptionAddress,
          _module_name_from_addr(ExceptionInfo->ExceptionRecord->ExceptionAddress, &StartAddr, szMod, sizeof(szMod)));
       _dump_context ( ExceptionInfo->ContextRecord );