Changeset 561 for trunk/src/corelib/thread/qthread_win.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/thread/qthread_win.cpp (modified) (12 diffs)

trunk/src/corelib/thread/qthread_win.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -55 +55 @@
 #include <private/qeventdispatcher_win_p.h>
 
-#include <windows.h>
+#include <windows.h>
 
 
@@ -113 +113 @@
             // avoid recursion.
             TlsSetValue(qt_current_thread_data_tls_index, threadData);
-            threadData->thread = new QAdoptedThread(threadData);
+            QT_TRY {
+                threadData->thread = new QAdoptedThread(threadData);
+            } QT_CATCH(...) {
+                TlsSetValue(qt_current_thread_data_tls_index, 0);
+                threadData->deref();
+                threadData = 0;
+                QT_RETHROW;
+            }
             threadData->deref();
         }
@@ -164 +171 @@
     if (qt_adopted_thread_watcher_handle == 0) {
         if (qt_adopted_thread_wakeup == 0) {
-            qt_adopted_thread_wakeup = QT_WA_INLINE(CreateEventW(0, false, false, 0),
-                                                    CreateEventA(0, false, false, 0));
+            qt_adopted_thread_wakeup = CreateEvent(0, false, false, 0);
             qt_adopted_thread_handles.prepend(qt_adopted_thread_wakeup);
         }
@@ -293 +299 @@
     data->quitNow = false;
     // ### TODO: allow the user to create a custom event dispatcher
-    if (QCoreApplication::instance())
-        createEventDispatcher(data);
+    createEventDispatcher(data);
 
 #if !defined(QT_NO_DEBUG) && defined(Q_CC_MSVC) && !defined(Q_OS_WINCE)
@@ -366 +371 @@
 {
 #ifndef Q_OS_WINCE
-    if (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)
-        SwitchToThread();
-    else
+    
+#else
+    
 #endif
-        ::Sleep(0);
 }
 
@@ -421 +425 @@
     }
 
-    // Since Win 9x will have problems if the priority is idle or time critical
-    // we have to use the closest one instead
     int prio;
     d->priority = priority;
     switch (d->priority) {
     case IdlePriority:
-        if (QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based) {
-            prio = THREAD_PRIORITY_LOWEST;
-        } else {
-            prio = THREAD_PRIORITY_IDLE;
-        }
+        prio = THREAD_PRIORITY_IDLE;
         break;
 
@@ -455 +453 @@
 
     case TimeCriticalPriority:
-        if (QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based) {
-            prio = THREAD_PRIORITY_HIGHEST;
-        } else {
-            prio = THREAD_PRIORITY_TIME_CRITICAL;
-        }
+        prio = THREAD_PRIORITY_TIME_CRITICAL;
         break;
 
@@ -565 +559 @@
     // copied from start() with a few modifications:
 
-    // Since Win 9x will have problems if the priority is idle or time critical
-    // we have to use the closest one instead
     int prio;
     d->priority = priority;
     switch (d->priority) {
     case IdlePriority:
-        if (QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based) {
-            prio = THREAD_PRIORITY_LOWEST;
-        } else {
-            prio = THREAD_PRIORITY_IDLE;
-        }
+        prio = THREAD_PRIORITY_IDLE;
         break;
 
@@ -599 +587 @@
 
     case TimeCriticalPriority:
-        if (QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based) {
-            prio = THREAD_PRIORITY_HIGHEST;
-        } else {
-            prio = THREAD_PRIORITY_TIME_CRITICAL;
-        }
+        prio = THREAD_PRIORITY_TIME_CRITICAL;
         break;