Changeset 3483 for trunk/src/kernel32/exceptions.cpp

Timestamp:

May 2, 2000, 10:53:15 PM (25 years ago)

Author:

sandervl

Message:

added exception stack dump code; GetLocaleInfoA fixes

File:

• trunk/src/kernel32/exceptions.cpp (modified) (7 diffs)

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.39 2000-04-14 22:35:27 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.40 2000-05-02 20:53:12 sandervl Exp $ */
 
 /*
- * Win32 Device IOCTL API functions for OS/2
+ * Win32 Exception functions for OS/2
  *
  * Ported Wine exception handling code
@@ -65 +65 @@
 #include <wprocess.h>
 #include "oslibexcept.h"
+#include "exceptstackdump.h"
 
 #define DBG_LOCALLOG    DBG_exceptions
@@ -535 +536 @@
 
 
-//******************************************************************************
-APIRET APIENTRY DosQueryModFromEIP (PULONG pulModule,
-                                    PULONG pulObject,
-                                    ULONG  ulBufferLength,
-                                    PSZ    pszBuffer,
-                                    PULONG pulOffset,
-                                    ULONG  ulEIP);
-//******************************************************************************
-
-
 /*****************************************************************************
  * Name      : void static dprintfException
@@ -840 +831 @@
            pERepRec->ExceptionAddress));
 
-  if (rc == NO_ERROR)
-    dprintf(("%s (#%u), obj #%u:%08x\n",
+  if(rc == NO_ERROR && ulObject != -1)
+    dprintf(("<%s> (#%u), obj #%u:%08x\n",
              szModule,
              ulModule,
@@ -847 +838 @@
              ulOffset));
   else
-    dprintf(("\n"));
+    dprintf(("<win32 app>\n"));
 
 
@@ -920 +911 @@
   dprintf(("---[End Of Exception Information]-----\n"));
 }
-
 
 /*****************************************************************************
@@ -1058 +1048 @@
 CrashAndBurn:
         CheckLogException();
-        dprintfException(pERepRec, pERegRec, pCtxRec, p);
+#ifdef DEBUG
+        dprintfException(pERepRec, pERegRec, pCtxRec, p);
+        if(pCtxRec->ContextFlags & CONTEXT_CONTROL) {
+                dbgPrintStack(pERepRec, pERegRec, pCtxRec, p);
+        }
+#endif
         if(fIsOS2Image == FALSE)  //Only for real win32 apps
         {