Changeset 615

Timestamp:

Feb 27, 2010, 1:33:23 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Make sure hardware error popups are disabled at application startup and restore the enabled state at application termination (fixes #131).

File:

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

trunk/src/corelib/kernel/qcoreapplication_pm.cpp

@@ -42 +42 @@
 ****************************************************************************/
 
+
+
+
 #include "qcoreapplication.h"
 #include "qcoreapplication_p.h"
 #include "qstringlist.h"
-#include "qt_os2.h"
 #include "qvector.h"
 #include "qmutex.h"
@@ -106 +108 @@
 }
 
-// @todo check if we really need this when doing timers in QEventDispatcherPM
-#if 0
-void QCoreApplicationPrivate::removePostedTimerEvent(QObject *object, int timerId)
+static ULONG savedDosErrorState = 0xff;
+
+)
 {
-    QThreadData *data = object->d_func()->threadData;
+    // 27 - Get process DosError setting
+    DosSysCtl(27, &savedDosErrorState);
+    // disable hardware error popups to make the user's life less annoying
+    DosError(savedDosErrorState & ~FERR_ENABLEHARDERR);
+    return 0;
+}
 
-    QMutexLocker locker(&data->postEventList.mutex);
-    if (data->postEventList.size() == 0)
-        return;
-    for (int i = 0; i < data->postEventList.size(); ++i) {
-        const QPostEvent & pe = data->postEventList.at(i);
-        if (pe.receiver == object
-            && pe.event
-            && (pe.event->type() == QEvent::Timer || pe.event->type() == QEvent::ZeroTimerEvent)
-            && static_cast<QTimerEvent *>(pe.event)->timerId() == timerId) {
-                --pe.receiver->d_func()->postedEvents;
-                pe.event->posted = false;
-                delete pe.event;
-                const_cast<QPostEvent &>(pe).event = 0;
-                return;
-            }
-    }
+static int globalDone()
+{
+    // restore error popups
+    DosError(savedDosErrorState);
+    return 0;
 }
-#endif
+
+Q_CONSTRUCTOR_FUNCTION(globalInit)
+Q_DESTRUCTOR_FUNCTION(globalDone)
 
 QT_END_NAMESPACE