Changeset 797

Timestamp:

Oct 19, 2010, 1:11:10 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Implemented QSysInfo::os2Version() (closes #66).

Location:

trunk/src/corelib/global

Files:

• qglobal.cpp (modified) (4 diffs)
• qglobal.h (modified) (1 diff)

trunk/src/corelib/global/qglobal.cpp

@@ -1039 +1039 @@
     \o \l MacintoshVersion specifies the version of the Macintosh
        operating system on which the application is run (Mac only).
+    \o \l os2Version() specifies the version of the OS/2
+       operating system on which the application is run (OS/2 only).
     \endlist
 
     Some constants are defined only on certain platforms. You can use
-    the preprocessor symbols Q_WS_WIN and Q_WS_MAC to test that
-    the application is compiled under Windows or Mac.
+    the preprocessor symbols Q_WS_WIN, Q_OS_MAC and Q_OS_OS2 to test that the
+    application is compiled under Windows, Mac or OS/2.
 
     \sa QLibraryInfo
@@ -1092 +1094 @@
     Returns the version of the S60 SDK system on which the
     application is run (S60 only).
+*/
+
+/*!
+    \fn QSysInfo::Os2Version QSysInfo::os2Version()
+    \since 4.6
+
+    Returns the version of the OS/2 operating system on which the
+    application is run (OS/2 only).
 */
 
@@ -1219 +1229 @@
 
     \sa SymbianVersion, WinVersion, MacVersion
+*/
+
+/*!
+    \enum QSysInfo::Os2Version
+
+    This enum provides symbolic names for the various versions of the
+    OS/2 operating system. On OS/2, the
+    QSysInfo::os2Version() function gives the version of the system on
+    which the application is run.
+
+    Original IBM OS/2 systems:
+
+    \value OV_Unknown  An unknown and currently unsupported OS/2 version
+    \value OV_2_0      OS/2 2.0 (unsupported)
+    \value OV_2_1      OS/2 2.1 (unsupported)
+    \value OV_2_11     OS/2 2.11 (unsupported)
+    \value OV_3_0      OS/2 3.0, corresponds to Warp 3 (unsupported)
+    \value OV_4_0      OS/2 4.0, corresponds to Warp 4 also known as Merlin
+    \value OV_4_5      OS/2 4.1, corresponds to Warp 4.5 also known as Aurora
+    \value OV_4_52     OS/2 4.1, corresponds to Warp 4.52 also known as WSeB
+
+    \value OV_WARP3    Symbolic name for OV_3_0
+    \value OV_WARP4    Symbolic name for OV_4_0
+    \value OV_WARP45   Symbolic name for OV_4_5
+
+    \value OV_MERLIN   Codename for OV_4_0
+    \value OV_AURORA   Codename for OV_4_5
+    \value OV_WSEB     Codename for OV_4_52
+
+    Serenity eComStation systems:
+
+    \value OV_ECS_Unknown       An unknown and currently unsupported
+                                eComStation version
+    \value OV_ECS_1_0           eComStation 1.0
+    \value OV_ECS_1_1           eComStation 1.1
+    \value OV_ECS_1_2           eComStation 1.2
+    \value OV_ECS_2_0           eComStation 2.0 (either any of RCs or GA)
+
+    The following masks can be used for detecting properties common to a group
+    of versions:
+
+    \value OV_WARP3     Set if the version represents an OS/2 Warp 3 system
+    \value OV_WARP4     Set if the version represents an OS/2 Warp 4 system
+    \value OV_WARP      Set if the version is either of the OS/2 Warp systems
+    \value OV_ECS       Set if the version represents an eComStation system
+
+    \sa WinVersion, SymbianVersion, MacVersion
 */
 
@@ -1894 +1951 @@
 #endif // ifdef Q_OS_SYMBIAN
 
+#ifdef Q_OS_OS2
+
+// Returns a version number of the component taken directly from its SYSLEVEL
+// file (see http://www.edm2.com/index.php/Using_SYSLEVEL_Files_in_Your_Applications
+// for more information about SYSLEVEL file internals)
+static bool getSyslevelVersion(const QByteArray &fileName, char (*version)[2])
+{
+    bool success = false;
+    FILE *f = fopen(fileName, "rb");
+    if (!f)
+        return success;
+    // go to the char d_version[2] field of the SYSLEVEL data structure
+    if ((success = fseek(f, 0x28, SEEK_SET) == 0)) {
+        // read in two bytes
+        success = fread(*version, 1, 2, f) == 2;
+    }
+    fclose(f);
+    return success;
+}
+
+QSysInfo::Os2Version QSysInfo::os2Version()
+{
+    static QSysInfo::Os2Version os2ver = OV_Unknown;
+    static bool os2VerSet = false;
+
+    if (os2VerSet)
+        return os2ver;
+    os2VerSet = true;
+
+    // detect the basic version number
+    ULONG buf[3];
+    if (DosQuerySysInfo(QSV_VERSION_MAJOR, QSV_VERSION_REVISION,
+                        &buf, sizeof(buf)) != NO_ERROR)
+        return os2ver;
+
+    if (buf[0] != 20) // QSV_VERSION_MAJOR
+        return os2ver;
+
+    switch (buf[1]) { // QSV_VERSION_MINOR
+        case 00: os2ver = OV_2_0; return os2ver;
+        case 10: os2ver = OV_2_1; return os2ver;
+        case 11: os2ver = OV_2_11; return os2ver;
+        case 30: os2ver = OV_3_0; return os2ver;
+        case 40: os2ver = OV_4_0; return os2ver;
+        case 45: break;
+        default: return os2ver;
+    }
+
+    if (DosQuerySysInfo(QSV_BOOT_DRIVE, QSV_BOOT_DRIVE,
+                        &buf, sizeof(buf)) != NO_ERROR)
+        return os2ver;
+
+    // See http://ewiki.ecomstation.nl/HowToDetectVersion on how to detect
+    // an eComStation version
+
+    // read SYSLEVEL.OS2
+    QByteArray fn = QByteArray("A:\\OS2\\INSTALL\\SYSLEVEL.OS2");
+    fn.data()[0] += buf[0] - 1;
+    char sys_os2_ver[2];
+    if (!getSyslevelVersion(fn, &sys_os2_ver))
+        return os2ver;
+
+    // read SYSLEVEL.ECS
+    fn = QByteArray("A:\\OS2\\INSTALL\\SYSLEVEL.ECS");
+    fn.data()[0] += buf[0] - 1;
+    char sys_ecs_ver[2];
+    if (!getSyslevelVersion(fn, &sys_ecs_ver)) {
+        // no or broken SYSLEVEL.ECS, it's either eCS 1.1 or below or non-eCS
+        bool have_ecsreg = false;
+        bool have_ecsreg11 = false;
+        fn = QByteArray("A:\\OS2\\ECSREG.INI");
+        fn.data()[0] += buf[0] - 1;
+        have_ecsreg = access(fn, F_OK) == 0;
+        fn = QByteArray("A:\\OS2\\ECSREG11.INI");
+        fn.data()[0] += buf[0] - 1;
+        have_ecsreg11 = access(fn, F_OK) == 0;
+        // detect eCS 1.1
+        if (have_ecsreg && have_ecsreg11)
+            return os2ver = OV_ECS_1_1;
+        // detect eCS 1.0
+        if (have_ecsreg)
+            return os2ver = OV_ECS_1_0;
+        // detect WSeB (4.52)
+        if (sys_os2_ver[0] == 0x45 &&sys_os2_ver[1] == 0x02)
+            return os2ver = OV_4_52;
+        // fallback to Aurora (QSV_VERSION_MINOR is 45 here)
+        return os2ver = OV_4_5;
+    }
+
+    // detect eCS >= 1.2
+    if (sys_ecs_ver[0] == 0x12 && sys_ecs_ver[1] == 0x00)
+        return os2ver = OV_ECS_1_2;
+    if (sys_ecs_ver[0] == 0x20 && sys_ecs_ver[1] == 0x00)
+        return os2ver = OV_ECS_2_0;
+
+    return os2ver = OV_ECS_Unknown;
+}
+
+static QSysInfo::Os2Version os2verDummy = QSysInfo::os2Version();
+
+#endif // ifdef Q_OS_OS2
+
 /*!
     \macro void Q_ASSERT(bool test)

trunk/src/corelib/global/qglobal.h

@@ -1521 +1521 @@
     static S60Version s60Version();
 #endif
+#ifdef Q_OS_OS2
+    enum Os2Version {
+        /* OS/2 version */
+        OV_Unknown  = 0x00000000,
+        OV_2_0      = 0x00000001,
+        OV_2_1      = 0x00000002,
+        OV_2_11     = 0x00000003,
+        OV_3_0      = 0x01000000,
+        OV_4_0      = 0x02040000,
+        OV_4_5      = 0x02040500,
+        OV_4_52     = 0x02040502,
+
+        /* OS/2 codenames */
+        OV_MERLIN   = OV_4_0,
+        OV_AURORA   = OV_4_5,
+        OV_WSEB     = OV_4_52,
+
+        /* eComStation version */
+        OV_ECS_Unknown  = 0x06000000,
+        OV_ECS_1_0      = 0x06010000,
+        OV_ECS_1_1      = 0x06010100,
+        OV_ECS_1_2      = 0x06010200,
+        OV_ECS_2_0      = 0x06020000,
+
+        /* version masks */
+        OV_WARP3        = 0x01000000,
+        OV_WARP4        = 0x02000000,
+        OV_WARP         = OV_WARP3 | OV_WARP4,
+        OV_ECS          = 0x04000000,
+    };
+    static Os2Version os2Version();
+#endif
 };