Changeset 139 for trunk/include

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/include

Files:

• qt_os2.h (modified) (1 diff)
• qwindowdefs_pm.h (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