Changeset 561 for trunk/src/corelib/plugin/qlibrary_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/plugin/qlibrary_win.cpp (modified) (5 diffs)

trunk/src/corelib/plugin/qlibrary_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$
 **
@@ -68 +68 @@
     //avoid 'Bad Image' message box
     UINT oldmode = SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX);
-    QT_WA({
-        pHnd = LoadLibraryW((TCHAR*)QDir::toNativeSeparators(attempt).utf16());
-    } , {
-        pHnd = LoadLibraryA(QFile::encodeName(QDir::toNativeSeparators(attempt)).data());
-    });
-    
+    pHnd = LoadLibrary((wchar_t*)QDir::toNativeSeparators(attempt).utf16());
+
     if (pluginState != IsAPlugin) {
 #if defined(Q_OS_WINCE)
         if (!pHnd && ::GetLastError() == ERROR_MOD_NOT_FOUND) {
             QString secondAttempt = fileName;
-            QT_WA({
-                pHnd = LoadLibraryW((TCHAR*)QDir::toNativeSeparators(secondAttempt).utf16());
-            } , {
-                pHnd = LoadLibraryA(QFile::encodeName(QDir::toNativeSeparators(secondAttempt)).data());
-            });
+            pHnd = LoadLibrary((wchar_t*)QDir::toNativeSeparators(secondAttempt).utf16());
         }
 #endif
         if (!pHnd && ::GetLastError() == ERROR_MOD_NOT_FOUND) {
             attempt += QLatin1String(".dll");
-            QT_WA({
-                pHnd = LoadLibraryW((TCHAR*)QDir::toNativeSeparators(attempt).utf16());
-            } , {
-                pHnd = LoadLibraryA(QFile::encodeName(QDir::toNativeSeparators(attempt)).data());
-            });
+            pHnd = LoadLibrary((wchar_t*)QDir::toNativeSeparators(attempt).utf16());
         }
     }
@@ -101 +89 @@
     if (pHnd) {
         errorString.clear();
-        QT_WA({
-            TCHAR buffer[MAX_PATH + 1];
-            ::GetModuleFileNameW(pHnd, buffer, MAX_PATH);
-            attempt = QString::fromUtf16(reinterpret_cast<const ushort *>(&buffer));
-        }, {
-            char buffer[MAX_PATH + 1];
-            ::GetModuleFileNameA(pHnd, buffer, MAX_PATH);
-            attempt = QString::fromLocal8Bit(buffer);
-        });
+
+        wchar_t buffer[MAX_PATH];
+        ::GetModuleFileName(pHnd, buffer, MAX_PATH);
+        attempt = QString::fromWCharArray(buffer);
+
         const QDir dir =  QFileInfo(fileName).dir();
         const QString realfilename = attempt.mid(attempt.lastIndexOf(QLatin1Char('\\')) + 1);