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

Timestamp:

Mar 18, 2000, 8:49:44 PM (25 years ago)

Author:

sandervl

Message:

added extra check for fs corruption during dll attach

File:

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

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.36 2000-02-29 19:17:13 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.37 2000-03-18 19:49:43 sandervl Exp $ */
 
 /*
@@ -1117 +1117 @@
 
   DosSetExceptionHandler(pExceptRec);
-  dprintf(("OS2SetExceptionHandler: exception chain %x (old %x)", pExceptRec, pExceptRec->prev_structure));
-}
+  dprintf(("OS2SetExceptionHandler: exception chain %x", pExceptRec));
+  PrintExceptionChain();
+}
+
+#ifdef DEBUG
+void PrintExceptionChain()
+{
+ USHORT sel = RestoreOS2FS();
+ PEXCEPTIONREGISTRATIONRECORD pExceptRec = (PEXCEPTIONREGISTRATIONRECORD)QueryExceptionChain();
+
+  dprintf(("Exception chain list:"));
+  while(pExceptRec != 0 && (ULONG)pExceptRec != -1) {
+        dprintf(("record %x", pExceptRec));
+        pExceptRec = pExceptRec->prev_structure;
+  }
+  SetFS(sel);
+}
+#endif
+
 
 /*****************************************************************************
@@ -1133 +1150 @@
 void OS2UnsetExceptionHandler(void *exceptframe)
 {
-  DosUnsetExceptionHandler((PEXCEPTIONREGISTRATIONRECORD)exceptframe);
+ PEXCEPTIONREGISTRATIONRECORD pExceptRec = (PEXCEPTIONREGISTRATIONRECORD)exceptframe;
+
+  DosUnsetExceptionHandler(pExceptRec);
+  dprintf(("OS2UnsetExceptionHandler: exception chain %x", pExceptRec));
+  PrintExceptionChain();
 }