Changeset 136 for trunk/src/kernel/qthread_pm.cpp

Timestamp:

Oct 18, 2006, 11:58:35 PM (19 years ago)

Author:

dmik

Message:

Kernel: Added the Qt-wide OS/2 system exception handler (see ticket:33 for details). It may be disabled by defining QT_PM_NO_SYSEXCEPTIONS when building Qt.

File:

• trunk/src/kernel/qthread_pm.cpp (modified) (2 diffs)

trunk/src/kernel/qthread_pm.cpp

@@ -39 +39 @@
 
 #include "qt_os2.h"
+
+#if !defined(QT_PM_NO_SYSEXCEPTIONS)
+extern // defined in qsysxcpt_pm.cpp
+ULONG APIENTRY qt_exceptionHandler( PEXCEPTIONREPORTRECORD pReportRec,
+                                    PEXCEPTIONREGISTRATIONRECORD pRegRec,
+                                    PCONTEXTRECORD pContextRec,
+                                    PVOID pv );
+extern ERR qt_libcExceptionHandler; // defined in qapplication_pm.cpp
+#endif
 
 #include "qthread.h"
@@ -106 +115 @@
     LocalStorage = arg [1];
 
+#if !defined(QT_PM_NO_SYSEXCEPTIONS)
+    // don't set the exception handler if not able to do it for main thread
+    bool setException = qt_libcExceptionHandler != NULL;
+    EXCEPTIONREGISTRATIONRECORD excRegRec = { 0, qt_exceptionHandler };
+    if ( setException )
+        DosSetExceptionHandler( &excRegRec );
+#endif
+
     ( (QThread *) arg[0] )->run();
 
     finish( (QThreadInstance *) arg[1] );
 
+#if !defined(QT_PM_NO_SYSEXCEPTIONS)
+    if ( setException )
+        DosUnsetExceptionHandler( &excRegRec );
+#endif
+    
     return;
 }