Changeset 139

Timestamp:

Oct 20, 2006, 11:44:52 PM (19 years ago)

Author:

dmik

Message:

Kernel/Tools: Improved OS/2 exception handling:

• Moved the excpetion handler code from the kernel module to the tools module (defines are now in qt_os2.h instead of qwindowdefs_pm.h);
• QT_PM_NO_SYSEXCEPTIONS is renamed to QT_OS2_NO_SYSEXCEPTIONS;
• Added the QtOS2SysXcptMainHandler stack-based class to correctly install the exception handler on the main thread, as well as provide an optional callback.

Location:

trunk

Files:

• include/qt_os2.h (modified) (1 diff)
• include/qwindowdefs_pm.h (modified) (1 diff)
• src/kernel/qapplication_pm.cpp (modified) (4 diffs)
• src/kernel/qt_kernel.pri (modified) (1 diff)
• src/kernel/qthread_pm.cpp (modified) (3 diffs)
• src/tools/qsysxcpt_pm.cpp (moved) (moved from trunk/src/kernel/qsysxcpt_pm.cpp ) (26 diffs)
• src/tools/qt_tools.pri (modified) (1 diff)

trunk/include/qt_os2.h

@@ -45 +45 @@
 #include <os2.h>
 
+// OS/2 system exception handler callback interface
+
+#if !defined(QT_OS2_NO_SYSEXCEPTIONS)
+
+enum QtOS2SysXcptReq
+{
+    QtOS2SysXcptReq_AppName = 0,
+    QtOS2SysXcptReq_AppVer = 1,
+    QtOS2SysXcptReq_ReportTo = 2,
+    QtOS2SysXcptReq_ReportSubj = 3,
+};
+
+typedef void (*QtOS2SysXcptWriter)( const char *str );
+typedef int (*QtOS2SysXcptCallback)( QtOS2SysXcptReq req,
+                                     QtOS2SysXcptWriter writer,
+                                     int reserved );
+
+class Q_EXPORT QtOS2SysXcptMainHandler
+{
+public:
+    QtOS2SysXcptMainHandler( QtOS2SysXcptCallback cb = NULL );
+    ~QtOS2SysXcptMainHandler();
+
+    class Private;
+    
+private:
+    EXCEPTIONREGISTRATIONRECORD rec;
+    
+    static bool installed;
+    static QtOS2SysXcptCallback callback;
+    static ERR libcHandler;
+
+    static ULONG APIENTRY handler( PEXCEPTIONREPORTRECORD pReportRec,
+                                   PEXCEPTIONREGISTRATIONRECORD pRegRec,
+                                   PCONTEXTRECORD pContextRec,
+                                   PVOID pv );
+
+    friend class QtOS2SysXcptMainHandlerInternal;
+    friend class QThreadInstance;
+
+    // these are private to allow only stack-based instances    
+    QtOS2SysXcptMainHandler( QtOS2SysXcptMainHandler &/*that*/ ) {}
+    QtOS2SysXcptMainHandler &operator =( QtOS2SysXcptMainHandler &/*that*/) {
+        return *this;
+    }
+    static void *operator new( size_t /*size*/ ) throw() { return NULL; }
+    static void operator delete( void */*memory*/ ) {}    
+};
+
+#endif // !defined(QT_OS2_NO_SYSEXCEPTIONS)
+
 #endif // QT_OS2_H

trunk/include/qwindowdefs_pm.h

@@ -124 +124 @@
 };
 
-// OS/2 system exception handler callback interface
-
-enum QtSysXcptReq
-{
-    QtSysXcptReq_AppName = 0,
-    QtSysXcptReq_AppVer = 1,
-    QtSysXcptReq_ReportTo = 2,
-    QtSysXcptReq_ReportSubj = 3,
-};
-
-typedef void (*QtSysXcptWriter)( const char *str );
-typedef int (*QtSysXcptCallback)( QtSysXcptReq req, QtSysXcptWriter writer,
-                                  int reserved );
-
-Q_EXPORT QtSysXcptCallback qInstallSysXcptCallback( QtSysXcptCallback cb );
-
 #endif

trunk/src/kernel/qapplication_pm.cpp

@@ -453 +453 @@
  *****************************************************************************/
 
-#if !defined(QT_PM_NO_SYSEXCEPTIONS)   
-extern // defined in qsysxcpt_pm.cpp
-ULONG APIENTRY qt_exceptionHandler( PEXCEPTIONREPORTRECORD pReportRec,
-                                    PEXCEPTIONREGISTRATIONRECORD pRegRec,
-                                    PCONTEXTRECORD pContextRec,
-                                    PVOID pv );
-ERR qt_libcExceptionHandler = NULL;
-#endif
+// wrapper for QtOS2SysXcptMainHandler to provide local access to private data
+class QtOS2SysXcptMainHandlerInternal : public QtOS2SysXcptMainHandler
+{
+public:
+    static bool &installed() { return QtOS2SysXcptMainHandler::installed; } 
+    static ERR &libcHandler() { return QtOS2SysXcptMainHandler::libcHandler; }
+    static ERR handler() { return QtOS2SysXcptMainHandler::handler; }
+};
+
+#define XcptMainHandler QtOS2SysXcptMainHandlerInternal
 
 // need to get default font?
@@ -467 +469 @@
 void qt_init( int *argcptr, char **argv, QApplication::Type )
 {
-#if !defined(QT_PM_NO_SYSEXCEPTIONS)
-    // Since the exception registration record can only be located on the stack,
+#if !defined(QT_OS2_NO_SYSEXCEPTIONS)
+    // Even if the user didn't install the exception handler for the main
+    // thread using QtOS2SysXcptMainHandler prior to constructing a QApplication
+    // instance, we still want it to be installed to catch system traps. But
+    // since the exception registration record can only be located on the stack,
     // we can enable our exception handling on the main thread only if the LIBC
     // library of the compiler provides an exception handler (already allocated
@@ -474 +479 @@
     // exception handler's pointer with our own (not nice but what to do?) and
     // call the former (to let it do signal processing and the stuff) after we
-    // generate the trap file. Note that if there is no LIBC exception handler
-    // provided, qt_libcExceptionHandler will remain NULL to tell QThread not to
-    // install our exception handler for newly created threads (all or nothing). 
-    {
-        PTIB ptib = NULL;
-        PPIB ppib = NULL;
-        DosGetInfoBlocks( &ptib, &ppib );
-        
-        Q_ASSERT( ptib && ppib );
-        if ( ptib && ppib ) {
+    // generate the trap file. Note that in this tricky case, the user has no
+    // possibility to install the exception handler callback (since it's only
+    // possible using QtOS2SysXcptMainHandler).
+
+    PTIB ptib = NULL;
+    DosGetInfoBlocks( &ptib, NULL );
+    Q_ASSERT( ptib && ptib->tib_ptib2 );
+    
+    if ( ptib && ptib->tib_ptib2 ) {
+        // must be called only on the main (first) thread 
+        Q_ASSERT( ptib->tib_ptib2->tib2_ultid == 1 );
+        // also make sure that QtOS2SysXcptMainHandler was not already
+        // instantiated on the main thread
+        if ( ptib->tib_ptib2->tib2_ultid == 1 &&
+             XcptMainHandler::installed() == FALSE )
+        {
             if ( ptib->tib_pexchain != END_OF_CHAIN ) {
-                PEXCEPTIONREGISTRATIONRECORD rec =
+                PEXCEPTIONREGISTRATIONRECORD r =
                     (PEXCEPTIONREGISTRATIONRECORD) ptib->tib_pexchain;
-                qt_libcExceptionHandler = rec->ExceptionHandler;
-                rec->ExceptionHandler = qt_exceptionHandler;
+                XcptMainHandler::libcHandler() = r->ExceptionHandler;
+                r->ExceptionHandler = XcptMainHandler::handler();
+                XcptMainHandler::installed() = TRUE;
             } else {
                 Q_ASSERT( 0 /* no exception handler for the main thread */ );
@@ -577 +589 @@
 //    QInputContext::shutdown();
 
-#if !defined(QT_PM_NO_SYSEXCEPTIONS)
+#if !defined(QT_OS2_NO_SYSEXCEPTIONS)
     // remove the exception handler if it was installed in qt_init() 
-    if ( qt_libcExceptionHandler ) {
-        PTIB ptib = NULL;
-        PPIB ppib = NULL;
-        DosGetInfoBlocks( &ptib, &ppib );
-        
-        Q_ASSERT( ptib && ppib );
-        if ( ptib && ppib ) {
+    PTIB ptib = NULL;
+    DosGetInfoBlocks( &ptib, NULL );
+    Q_ASSERT( ptib && ptib->tib_ptib2 );
+    
+    if ( ptib && ptib->tib_ptib2 ) {
+        // must be called only on the main (first) thread 
+        Q_ASSERT( ptib->tib_ptib2->tib2_ultid == 1 );
+        // also make sure the handler was really installed by qt_init()
+        if ( ptib->tib_ptib2->tib2_ultid == 1 &&
+             XcptMainHandler::installed() == TRUE &&
+             XcptMainHandler::libcHandler() != NULL )
+        {
             Q_ASSERT( ptib->tib_pexchain != END_OF_CHAIN );
             if ( ptib->tib_pexchain != END_OF_CHAIN ) {
-                PEXCEPTIONREGISTRATIONRECORD rec =
+                PEXCEPTIONREGISTRATIONRECORD r =
                     (PEXCEPTIONREGISTRATIONRECORD) ptib->tib_pexchain;
-                Q_ASSERT( rec->ExceptionHandler == qt_exceptionHandler );
-                if ( rec->ExceptionHandler == qt_exceptionHandler ) {
-                    rec->ExceptionHandler = qt_libcExceptionHandler;
-                    qt_libcExceptionHandler = NULL;
+                Q_ASSERT( r->ExceptionHandler == XcptMainHandler::handler() );
+                if ( r->ExceptionHandler == XcptMainHandler::handler() ) {
+                    r->ExceptionHandler = XcptMainHandler::libcHandler();
+                    XcptMainHandler::libcHandler() = NULL;
+                    XcptMainHandler::installed() = FALSE;
                 }
             }

trunk/src/kernel/qt_kernel.pri

@@ -140 +140 @@
                   $$KERNEL_CPP/qthread_pm.cpp \
                   $$KERNEL_CPP/qwidget_pm.cpp \
-                  $$KERNEL_CPP/qfontengine_pm.cpp \
-                  $$KERNEL_CPP/qsysxcpt_pm.cpp
+                  $$KERNEL_CPP/qfontengine_pm.cpp
 
         unix:x11 {

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"
@@ -115 +106 @@
     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 !defined(QT_OS2_NO_SYSEXCEPTIONS)
+    // don't set the exception handler if not able to do it for the main thread
+    bool setException = QtOS2SysXcptMainHandler::installed;
+    EXCEPTIONREGISTRATIONRECORD excRegRec =
+        { 0, QtOS2SysXcptMainHandler::handler };
     if ( setException )
         DosSetExceptionHandler( &excRegRec );
@@ -127 +119 @@
     finish( (QThreadInstance *) arg[1] );
 
-#if !defined(QT_PM_NO_SYSEXCEPTIONS)
+#if !defined(QT_OS2_NO_SYSEXCEPTIONS)
     if ( setException )
         DosUnsetExceptionHandler( &excRegRec );

trunk/src/tools/qsysxcpt_pm.cpp

@@ -41 +41 @@
  */
 
-#if !defined(QT_PM_NO_SYSEXCEPTIONS)    
+#if !defined(QT_OS2_NO_SYSEXCEPTIONS)
  
 #include "qt_os2.h"
@@ -59 +59 @@
 //     contexts to the trap file when a real exception happens on one thread
 
-extern ERR qt_libcExceptionHandler; // defined in qapplication_pm.cpp
-
-static QtSysXcptCallback qt_excCallback = NULL;
-static FILE *qt_excWriteMsg_file = NULL;
-
-static void qt_excCallbackWriter( const char *pcszMsg );
-
-/**
- *  Installs \a cb as the OS/2 system exception handler callback.
- *  Passing NULL as \a cb will uninstall the currently installed callback.
- *
- *  @todo (r=dmik) describe the callback...  
- */
-Q_EXPORT QtSysXcptCallback qInstallSysXcptCallback( QtSysXcptCallback cb )
-{
-    QtSysXcptCallback tmp = qt_excCallback;
-    qt_excCallback = cb;
-    return tmp;
+/*! \class QtOS2SysXcptMainHandler qt_os2.h
+
+    @todo (r=dmik) describe...
+    
+    - must be instantiated on the stack of the main thread only
+    - must be instantiated before a QAplication instance is created
+*/
+
+/* static */
+bool QtOS2SysXcptMainHandler::installed = FALSE;
+QtOS2SysXcptCallback QtOS2SysXcptMainHandler::callback = NULL;
+ERR QtOS2SysXcptMainHandler::libcHandler = NULL;
+
+/*!
+    @todo (r=dmik) describe...        
+*/
+QtOS2SysXcptMainHandler::QtOS2SysXcptMainHandler( QtOS2SysXcptCallback cb )
+{
+    rec.prev_structure = NULL;
+    rec.ExceptionHandler = NULL;
+    
+    PTIB ptib = NULL;
+    DosGetInfoBlocks( &ptib, NULL );
+    Q_ASSERT( ptib && ptib->tib_ptib2 );
+
+    if ( ptib && ptib->tib_ptib2 )
+    {
+        // must be instantiated only on the main (first) thread 
+        Q_ASSERT( ptib->tib_ptib2->tib2_ultid == 1 );
+        if ( ptib->tib_ptib2->tib2_ultid == 1 )
+        {
+            // must not be already instantiated
+            Q_ASSERT( installed == FALSE );
+            Q_ASSERT( libcHandler == NULL );
+            if ( installed == FALSE && libcHandler == NULL )
+            {
+                installed = TRUE;
+                callback = cb;
+                // install the exception handler for the main thread 
+                rec.ExceptionHandler = handler;
+                DosSetExceptionHandler( &rec );
+            }
+        }
+    }
+}
+
+/*!
+    @todo (r=dmik) describe...        
+*/
+QtOS2SysXcptMainHandler::~QtOS2SysXcptMainHandler()
+{
+    Q_ASSERT( rec.ExceptionHandler == handler || rec.ExceptionHandler == NULL );
+    if ( rec.ExceptionHandler == handler )
+    {
+        // uninstall the exception handler for the main thread
+        DosUnsetExceptionHandler( &rec );
+        rec.ExceptionHandler = NULL;
+        callback = NULL; 
+        installed = FALSE;
+    }
 }
 
 static void qt_excEscapeString( FILE *file, const char *pcszStr );
 
-static void qt_excCallbackWriter( const char *msg )
-{
-    if ( qt_excWriteMsg_file )
-        qt_excEscapeString( qt_excWriteMsg_file, msg );
-}
-
-inline int qt_excAskCallback( QtSysXcptReq req )
-{
-    if ( qt_excCallback )
-        return qt_excCallback( req, NULL, 0 );
-    return FALSE; 
-}
-
-inline int qt_excLetCallback( QtSysXcptReq req )
-{
-    if ( qt_excCallback )
-        return qt_excCallback( req, qt_excCallbackWriter, 0 );
-    return FALSE; 
-}
-
-/**
- *  Writes the given string with [<>&'"] characters escaped for XML.
- */
+#define XcptPvt QtOS2SysXcptMainHandler::Private
+
+class XcptPvt
+{
+public:
+    static void callbackWriter( const char *msg );
+
+    static inline int askCallback( QtOS2SysXcptReq req )
+    {
+        if ( callback )
+            return callback( req, NULL, 0 );
+        return FALSE; 
+    }
+
+    static inline int letCallback( QtOS2SysXcptReq req )
+    {
+        if ( callback )
+            return callback( req, callbackWriter, 0 );
+        return FALSE; 
+    }
+    
+    static FILE *file;
+};
+
+/* static */
+FILE *XcptPvt::file = NULL;
+
+/* static */
+void XcptPvt::callbackWriter( const char *msg )
+{
+    if ( file )
+        qt_excEscapeString( file, msg );
+}
+
+/*! \internal
+    Writes the given string with [<>&'"] characters escaped for XML.
+*/
 static void qt_excEscapeString( FILE *file, const char *pcszStr )
 {
@@ -130 +186 @@
 }
 
-/**
- *  Writes the given error message.
- */
+/*! \internal
+    Writes the given error message.
+*/
 static void qt_excWriteErrorMsg( FILE *file, ULONG ulIndent, const char *pcszMsg,
                                  ... )
@@ -147 +203 @@
 }
 
-/**
- *  Writes the register name, value and optionally memory flags
- */
+/*! \internal
+    Writes the register name, value and optionally memory flags
+*/
 static void qt_excWriteReg( FILE *file, const char *pszName, ULONG ulValue,
                             BOOL bQueryMem = TRUE )
 {
-    fprintf( file, "    <Register name=\"%s\" value=\"%08lX\"", 
+    fprintf( file, "     <Register name=\"%s\" value=\"%08lX\"", 
              pszName, ulValue );
 
@@ -175 +231 @@
 }
 
-/**
- *  Writes information about a signle stack frame.
- */
+/*! \internal
+    Writes information about a signle stack frame.
+*/
 static void qt_excWriteStackFrame( FILE *file, ULONG ulPointer, ULONG ulAddress )
 {
@@ -187 +243 @@
 
     if ( ulPointer )
-        fprintf( file, "    <Frame pointer=\"%08lX\">\n", ulPointer );
+        fprintf( file, "     <Frame pointer=\"%08lX\">\n", ulPointer );
     else
-        fprintf( file, "    <Frame pointer=\"current\">\n" );
+        fprintf( file, "     <Frame pointer=\"current\">\n" );
             
     if ( ulAddress )
     {
-        fprintf( file, "     <Location address=\"%08lX\">\n", ulAddress );
+        fprintf( file, "      <Location address=\"%08lX\">\n", ulAddress );
     
         arc = DosQueryModFromEIP( &hMod, &ulObject,
@@ -205 +261 @@
         {
             DosQueryModuleName( hMod, sizeof(szMod), szMod );
-            fprintf( file, "      <Module ID=\"%04lX\" name=\"", hMod );
+            fprintf( file, "       <Module ID=\"%04lX\" name=\"", hMod );
             qt_excEscapeString( file, szMod ); 
             fprintf( file, "\" \n"
-                           "              segment=\"%04lX\" offset=\"%08lX\"/>\n",
+                           "               segment=\"%04lX\" offset=\"%08lX\"/>\n",
                      ulObject + 1, ulOffset ); 
 /// @todo (r=dmik) use .DBG and .SYM files to get symbols
@@ -221 +277 @@
         qt_excWriteErrorMsg( file, 5, "Unable to access stack frame" );
     
-    fprintf( file, "     </Location>\n"
-                   "    </Frame>\n" );
-}
-
-/**
- *  Walks the stack and writes information about stack frames.
- */
+    fprintf( file, "      </Location>\n"
+                   "     </Frame>\n" );
+}
+
+/*! \internal
+    Walks the stack and writes information about stack frames.
+*/
 static void qt_excWriteStackFrames( FILE *file, PTIB ptib,
                                     PCONTEXTRECORD pContextRec )
@@ -233 +289 @@
     PULONG pulStackWord = 0;
 
-    fprintf( file, "   <Frames>\n" );
+    fprintf( file, "    <Frames>\n" );
 
     // first the trapping address itself
@@ -255 +311 @@
                          != (PAG_COMMIT|PAG_READ)) )
             {
-                fprintf( file, "    <Frame pointer=\"%08lX\">\n",
+                fprintf( file, "     <Frame pointer=\"%08lX\">\n",
                          (ULONG) pulStackWord );
-                qt_excWriteErrorMsg( file, 5,
+                qt_excWriteErrorMsg( file, 6,
                                      "Unable to access stack frame, DosQueryMem "
                                      "returned %lu and flags %08lX",
                                      arc, ulFlagsPage );
-                fprintf( file, "    </Frame>\n" );
+                fprintf( file, "     </Frame>\n" );
                 pulStackWord += 0x1000;
                 continue; // while
@@ -271 +327 @@
     } // end while
 
-    fprintf( file, "   </Frames>\n" );
-}
-
-/**
- *  Writes the thread information.
- */
+    fprintf( file, "    </Frames>\n" );
+}
+
+/*! \internal
+    Writes the thread information.
+*/
 static void qt_excWriteThreadInfo( FILE *file, PTIB ptib,
                                    PEXCEPTIONREPORTRECORD pReportRec,
@@ -289 +345 @@
     DosSetPriority( PRTYS_THREAD, PRTYC_REGULAR, PRTYD_MAXIMUM, 0 );
 
-    fprintf( file, " <Thread ID=\"%04lX\" slot=\"%04lX\" "
-                            "priority=\"%04lX\" "
-                            "mc=\"%04lX\" mcf=\"%04lX\">\n",
+    fprintf( file, "  <Thread ID=\"%04lX\" slot=\"%04lX\" "
+                             "priority=\"%04lX\" "
+                             "mc=\"%04lX\" mcf=\"%04lX\">\n",
              ptib->tib_ptib2->tib2_ultid, ptib->tib_ordinal, ulOldPriority,
              ptib->tib_ptib2->tib2_usMCCount, ptib->tib_ptib2->tib2_fMCForceFlag );
@@ -298 +354 @@
 
     fprintf( file,
-             "  <Exception type=\"%08lX\" flags=\"%08lX\" address=\"%08lX\">\n",
+             "   <Exception type=\"%08lX\" flags=\"%08lX\" address=\"%08lX\">\n",
              pReportRec->ExceptionNum, pReportRec->fHandlerFlags,
              (ULONG) pReportRec->ExceptionAddress );
@@ -304 +360 @@
     for ( ul = 0; ul < pReportRec->cParameters;  ++ul )
     {
-        fprintf( file, "   <Param value=\"%08lX\"/>\n",
+        fprintf( file, "    <Param value=\"%08lX\"/>\n",
                  pReportRec->ExceptionInfo[ul] );
     }
 
-    fprintf( file, "  </Exception>\n" );
+    fprintf( file, "   </Exception>\n" );
     
     // *** registers
 
-    fprintf( file, "  <CPU>\n"
-                   "   <Registers>\n" );
+    fprintf( file, "   <CPU>\n"
+                   "    <Registers>\n" );
 
     if ( pContextRec->ContextFlags & CONTEXT_SEGMENTS )
@@ -343 +399 @@
     }
     
-    fprintf( file, "   </Registers>\n"
-                   "  </CPU>\n" );
+    fprintf( file, "    </Registers>\n"
+                   "   </CPU>\n" );
 
     // *** stack
 
-    fprintf( file, "  <Stack base=\"%08lX\" limit=\"%08lX\">\n",
+    fprintf( file, "   <Stack base=\"%08lX\" limit=\"%08lX\">\n",
              (ULONG) ptib->tib_pstack,
              (ULONG) ptib->tib_pstacklimit );
@@ -357 +413 @@
     }    
     
-    fprintf( file, "  </Stack>\n"
-                   " </Thread>\n" );
+    fprintf( file, "   </Stack>\n"
+                   "  </Thread>\n" );
     
     // reset old priority
@@ -366 +422 @@
 }
 
-/**
- * Writes exception information to the log file.
- */
+/*! \internal
+    Writes exception information to the log file.
+*/
 static void qt_excWriteException( FILE *file,
                                   const char *pszExeName,
@@ -382 +438 @@
     {
         fprintf( file, " <Application name=\"" );
-        if ( qt_excAskCallback( QtSysXcptReq_AppName ) == TRUE )
-            qt_excLetCallback( QtSysXcptReq_AppName );
+        if ( XcptPvt::askCallback( QtOS2SysXcptReq_AppName ) == TRUE )
+            XcptPvt::letCallback( QtOS2SysXcptReq_AppName );
         else
             qt_excEscapeString( file, pszExeBase );
         fprintf( file, "\" version=\"" );
-        if ( qt_excAskCallback( QtSysXcptReq_AppVer ) == TRUE )
-            qt_excLetCallback( QtSysXcptReq_AppVer );
+        if ( XcptPvt::askCallback( QtOS2SysXcptReq_AppVer ) == TRUE )
+            XcptPvt::letCallback( QtOS2SysXcptReq_AppVer );
         else
             fprintf( file, "unknown" );
         fprintf( file, "\">\n" );
 
-        if ( qt_excAskCallback( QtSysXcptReq_ReportTo ) == TRUE )
+        if ( XcptPvt::askCallback( QtOS2SysXcptReq_ReportTo ) == TRUE )
         {
             fprintf( file, "  <Report to=\"" );
-            qt_excLetCallback( QtSysXcptReq_ReportTo );
-            if ( qt_excAskCallback( QtSysXcptReq_ReportSubj ) == TRUE )
+            XcptPvt::letCallback( QtOS2SysXcptReq_ReportTo );
+            if ( XcptPvt::askCallback( QtOS2SysXcptReq_ReportSubj ) == TRUE )
             {
                 fprintf( file, "\" subject=\"" );
-                qt_excLetCallback( QtSysXcptReq_ReportSubj );
+                XcptPvt::letCallback( QtOS2SysXcptReq_ReportSubj );
             }
             fprintf( file, "\"/>\n" );
@@ -436 +492 @@
         qt_excWriteErrorMsg( file, 1, "ppib is NULL" );
 
+        fprintf( file, " <Threads>\n" );
+        
     if ( ptib && ptib->tib_ptib2 )
         qt_excWriteThreadInfo( file, ptib, pReportRec, pContextRec );
@@ -442 +500 @@
     else
         qt_excWriteErrorMsg( file, 1, "ptib->tib_ptib2 is NULL" );
+
+        fprintf( file, " </Threads>\n" );
 }
 
@@ -544 +604 @@
 }
 
-/**
- * Qt Exception handler.
- */
-ULONG APIENTRY qt_exceptionHandler( PEXCEPTIONREPORTRECORD pReportRec,
-                                    PEXCEPTIONREGISTRATIONRECORD pRegRec,
-                                    PCONTEXTRECORD pContextRec,
-                                    PVOID pv )
-{
+/*! \internal
+    Qt Exception handler.
+*/
+/* static */
+ULONG APIENTRY
+QtOS2SysXcptMainHandler::handler( PEXCEPTIONREPORTRECORD pReportRec,
+                                  PEXCEPTIONREGISTRATIONRECORD pRegRec,
+                                  PCONTEXTRECORD pContextRec,
+                                  PVOID pv )
+{
+    PTIB ptib = NULL;
+    PPIB ppib = NULL;
+    
     /* From the VAC++3 docs:
      *      "The first thing an exception handler should do is check the
@@ -571 +636 @@
         return XCPT_CONTINUE_SEARCH;
 
+    // can it ever fail?...
+    DosGetInfoBlocks( &ptib, &ppib );
+        
     switch (pReportRec->ExceptionNum)
     {
@@ -585 +653 @@
             char szFileName[CCHMAXPATH];
             FILE *file = NULL;
-            PTIB ptib = NULL;
-            PPIB ppib = NULL;
             char szExeName[CCHMAXPATH] = "unknown";
             char szExeBase[CCHMAXPATH];
             
             DosBeep( 880, 200 );
-
-            // can it ever fail?...
-            DosGetInfoBlocks( &ptib, &ppib );
 
             if ( ppib )
@@ -675 +738 @@
                          QT_VERSION_STR );
 
-                qt_excWriteMsg_file = file;
+                XcptPvt::file = file;
                 
                 // write trap information
@@ -681 +744 @@
                                       ppib, ptib, pReportRec, pContextRec );
 
-                qt_excWriteMsg_file = NULL;
+                XcptPvt::file = NULL;
                 
                 fprintf( file, "</Trap>\n\n" );
@@ -705 +768 @@
     }
 
-    // we never handle the exception ourselves but let the LIBC exception
-    // handler process it
-    return qt_libcExceptionHandler( pReportRec, pRegRec, pContextRec, pv );
+    // we never handle the exception ourselves
+
+    if ( ptib && ptib->tib_ptib2 && ptib->tib_ptib2->tib2_ultid == 1 &&
+         QtOS2SysXcptMainHandler::libcHandler != NULL )
+    {
+        // we are on the main thread and were installed from qt_init() during
+        // QApplication initialization using a hack; pass control back to the
+        // LIBC exception handler
+        return QtOS2SysXcptMainHandler::libcHandler( pReportRec, pRegRec,
+                                                     pContextRec, pv );
+    }
+    
+    return XCPT_CONTINUE_SEARCH; 
 }
 

trunk/src/tools/qt_tools.pri

@@ -99 +99 @@
                   $$TOOLS_CPP/qwaitcondition_pm.cpp \
                   $$TOOLS_CPP/qthreadstorage_pm.cpp \
-                  $$TOOLS_CPP/qcriticalsection_p.cpp
+                  $$TOOLS_CPP/qcriticalsection_p.cpp \
+                  $$TOOLS_CPP/qsysxcpt_pm.cpp
 
         offmac:SOURCES += $$TOOLS_CPP/qdir_mac.cpp \