Changeset 84

Timestamp:

12/03/06 18:45:43 (2 years ago)

Author:

dmik

Message:

Psi: Added installation of the OS/2 System Exception handler (QtOS2SysXcptHandler) on the main thread.

Location:

psi/trunk/src

Files:

• common.cpp (modified) (3 diffs)
• main.cpp (modified) (2 diffs)
• psiapplication.cpp (modified) (1 diff)

psi/trunk/src/common.cpp

@@ -21 +21 @@
 #include"common.h"
 
+#if defined(Q_OS_OS2) && !defined(QT_OS2_NO_SYSEXCEPTIONS)
+#include <qt_os2.h>
+#endif
+
 #include"profiles.h"
 #include"rtparse.h"
@@ -27 +31 @@
 
 QString PROG_NAME = "Psi/2";
-QString PROG_VERSION = "0.10.1";
-//QString PROG_VERSION = "0.10.1-dev (" __DATE__ ")";
+//QString PROG_VERSION = "0.10.2";
+QString PROG_VERSION = "0.10.2-dev (" __DATE__ ")";
 
 #ifdef HAVE_CONFIG
@@ -2011 +2015 @@
 }
 
+#if defined(Q_OS_OS2) && !defined(QT_OS2_NO_SYSEXCEPTIONS)
+int psiOS2SysXcptCallback( QtOS2SysXcptReq req, QtOS2SysXcptWriter writer,
+                                                   int /* reserved */ )
+{
+    switch( req )
+    {
+        case QtOS2SysXcptReq_AppName:
+            if ( writer ) writer( PROG_NAME.latin1() );
+            return TRUE;
+        case QtOS2SysXcptReq_AppVer:
+            if ( writer ) writer( PROG_VERSION.latin1() );
+            return TRUE;
+        case QtOS2SysXcptReq_ReportTo:
+            if ( writer ) writer( "qt-traps@hugaida.com" );
+            return TRUE;
+                default:
+                        break;
+    }
+    return FALSE;
+}
+#endif

psi/trunk/src/main.cpp

@@ -34 +34 @@
 #include<qmessagebox.h>
 #include<qca.h>
+
+#if defined(Q_OS_OS2) && !defined(QT_OS2_NO_SYSEXCEPTIONS)
+#include <qt_os2.h>
+extern // defined in common.cpp
+int psiOS2SysXcptCallback( QtOS2SysXcptReq req, QtOS2SysXcptWriter writer,
+                                                   int /* reserved */ );
+#endif
+
+
 #include<stdlib.h>
 #include<time.h>
+
 #include"common.h"
 #include"profiles.h"
@@ -337 +347 @@
 int main(int argc, char *argv[])
 {
+#if defined(Q_OS_OS2) && !defined(QT_OS2_NO_SYSEXCEPTIONS)
+        // install the OS/2 system exception handler and callback
+    QtOS2SysXcptMainHandler sysXcptHandler( psiOS2SysXcptCallback );
+#endif
+
         // add library paths before creating QApplication
         if (!loadGlobal())

psi/trunk/src/psiapplication.cpp

@@ -128 +128 @@
         Q_UNUSED(GUIenabled);
 #ifdef Q_WS_PM
+        // enable ft2lib when appropriate
         if ( GUIenabled ) {
                 Ft2EnableFontEngine =