Changeset 75

Timestamp:

Jul 9, 2009, 8:37:15 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: OS/2: Implemented QLibrary.

Location:

trunk/src/corelib/plugin

Files:

• plugin.pri (modified) (1 diff)
• qlibrary_os2.cpp (copied) (copied from trunk/src/corelib/plugin/qlibrary_win.cpp ) (4 diffs)
• qlibrary_p.h (modified) (2 diffs)

trunk/src/corelib/plugin/plugin.pri

@@ -20 +20 @@
 }
 
+
+
+
+
 unix {
         SOURCES += plugin/qlibrary_unix.cpp

trunk/src/corelib/plugin/qlibrary_os2.cpp

@@ -1 @@
-/****************************************************************************
+/***************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Qt Software Information ([email protected])
+
+
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -47 +49 @@
 #include "qdir.h"
 
-#if defined(QT_NO_LIBRARY) && defined(Q_OS_WIN)
-#undef QT_NO_LIBRARY
-#pragma message("QT_NO_LIBRARY is not supported on Windows")
-#endif
-
-#include "qt_windows.h"
+#ifndef QT_NO_LIBRARY
 
 QT_BEGIN_NAMESPACE
 
-extern QString qt_error_string(int code);
+// provide human readable strings for common OS/2 DOS errors
+// @todo make exported if needed anywhere else
+static QString qt_os2_error_string(APIRET code)
+{
+    // see qt_error_string()
+
+    const char *s = 0;
+    QString ret;
+
+    switch (code) {
+        case NO_ERROR:
+            return ret;
+        case ERROR_FILE_NOT_FOUND:
+            s = QT_TRANSLATE_NOOP("QIODevice", "File not found");
+            break;
+        case ERROR_PATH_NOT_FOUND:
+            s = QT_TRANSLATE_NOOP("QIODevice", "Path not found");
+            break;
+        case ERROR_TOO_MANY_OPEN_FILES:
+            return qt_error_string(EMFILE);
+        case ERROR_ACCESS_DENIED:
+            s = QT_TRANSLATE_NOOP("QIODevice", "Access denied");
+            break;
+        case ERROR_SHARING_VIOLATION:
+            s = QT_TRANSLATE_NOOP("QIODevice", "Sharing violation");
+            break;
+        default:
+            break;
+    }
+
+    if (s)
+        // ######## this breaks moc build currently
+//         ret = QCoreApplication::translate("QIODevice", s);
+        ret = QString::fromLatin1(s);
+    else
+        // ######## this breaks moc build currently
+//         ret = QString(QCoreApplication::translate("QIODevice","System error %1")).arg(code);
+        ret = QString::fromLatin1("System error %1").arg(code);
+    return ret;
+}
 
 bool QLibraryPrivate::load_sys()
 {
-#ifdef Q_OS_WINCE
-    QString attempt = QFileInfo(fileName).absoluteFilePath();
-#else
-    QString attempt = fileName;
-#endif
+    pHnd = 0;
 
-    //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());
-    });
-    
-    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());
-            });
-        }
-#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());
-            });
-        }
+    QByteArray attempt = QFile::encodeName(QDir::toNativeSeparators(fileName));
+
+    APIRET rc;
+    char errModule[CCHMAXPATH] = { '\0' };
+    rc = DosLoadModule(errModule, sizeof(errModule), attempt, &pHnd);
+    if (rc == ERROR_FILE_NOT_FOUND) {
+        attempt += ".DLL";
+        rc = DosLoadModule(errModule, sizeof(errModule), attempt, &pHnd);
     }
 
-    SetErrorMode(oldmode);
-    if (!pHnd) {
-        errorString = QLibrary::tr("Cannot load library %1: %2").arg(fileName).arg(qt_error_string());
+    if (rc != NO_ERROR) {
+        errorString = QLibrary::tr("Cannot load library %1: %2")
+            .arg(fileName).arg(qt_os2_error_string(rc));
+        if (*errModule != '\0')
+            errorString += QLibrary::tr(" (failed module: %1)").arg(errModule);
+        return false;
     }
-    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);
-        });
-        const QDir dir =  QFileInfo(fileName).dir();
-        const QString realfilename = attempt.mid(attempt.lastIndexOf(QLatin1Char('\\')) + 1);
-        if (dir.path() == QLatin1String("."))
-            qualifiedFileName = realfilename;
-        else
-            qualifiedFileName = dir.filePath(realfilename);
-    }
-    return (pHnd != 0);
+
+    errorString.clear();
+    rc = DosQueryModuleName(pHnd, sizeof(errModule), errModule);
+    Q_ASSERT(rc == NO_ERROR);
+
+    qualifiedFileName = QDir::fromNativeSeparators(QFile::decodeName(QByteArray(errModule)));
+
+    return true;
 }
 
 bool QLibraryPrivate::unload_sys()
 {
-    if (!FreeLibrary(pHnd)) {
-        errorString = QLibrary::tr("Cannot unload library %1: %2").arg(fileName).arg(qt_error_string());
+    APIRET rc = DosFreeModule(pHnd);
+    if (rc != NO_ERROR) {
+        errorString = QLibrary::tr("Cannot unload library %1: %2").arg(fileName).arg(qt_os2_error_string(rc));
         return false;
     }
@@ -132 +138 @@
 void* QLibraryPrivate::resolve_sys(const char* symbol)
 {
-#ifdef Q_OS_WINCE
-    void* address = (void*)GetProcAddress(pHnd, (const wchar_t*)QString::fromLatin1(symbol).utf16());
-#else
-    void* address = (void*)GetProcAddress(pHnd, symbol);
-#endif
-    if (!address) {
+    void *address = 0;
+    APIRET rc = DosQueryProcAddr(pHnd, 0, symbol, (PFN*) &address);
+    if (rc != NO_ERROR) {
         errorString = QLibrary::tr("Cannot resolve symbol \"%1\" in %2: %3").arg(
-            QString::fromAscii(symbol)).arg(fileName).arg(qt_error_string());
+            QString::fromAscii(symbol)).arg(fileName).arg(qt_));
     } else {
         errorString.clear();
@@ -146 +149 @@
 }
 QT_END_NAMESPACE
+
+

trunk/src/corelib/plugin/qlibrary_p.h

@@ -54 +54 @@
 //
 
-#ifdef Q_WS_WIN
+#if
 # include "QtCore/qt_windows.h"
+
+
 #endif
 #include "QtCore/qlibrary.h"
@@ -73 +75 @@
 public:
 
-#ifdef Q_WS_WIN
+#if
     HINSTANCE
+
+
 #else
     void *