Ticket #277: 277.diff

src/corelib/global/qglobal.cpp

@@ -1271 +1271 @@
     \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)
+    \value OV_ECS_2_1           eComStation 2.1 (either any of RCs or GA)
+    \value OV_ECS_2_2           eComStation 2.2 (either any of RCs or GA)
 
     The following masks can be used for detecting properties common to a group
     of versions:
@@ -1986 +1988 @@
     return success;
 }
 
+// beginning from ecs 2.1 they changed the detection scheme once more
+// the information is now in the ecs_inst.flg file as plain text
+static bool getFLGVersion(const QByteArray &fileName, char (*version)[3])
+{
+    bool success = false;
+    FILE *f = fopen(fileName, "rb");
+    if (!f)
+        return success;
+    // skip eComStation_ and read then
+    if ((success = fseek(f, 0x0C, SEEK_SET) == 0)) {
+        // read in tree bytes
+        success = fread(*version, 1, 3, f) == 3;
+    }
+    fclose(f);
+    return success;
+}
+
 QSysInfo::Os2Version QSysInfo::os2Version()
 {
     static QSysInfo::Os2Version os2ver = OV_Unknown;
@@ -2058 +2077 @@
     // 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;
+    if (sys_ecs_ver[0] >= 0x20 && sys_ecs_ver[1] == 0x00)
+    {
+        os2ver = OV_ECS_2_0;
+        // read ecs_inst.flg
+        char flg_ecs_ver[3];
+        fn = QByteArray("A:\\ECS\\ECS_INST.FLG");
+        fn.data()[0] += buf[0] - 1;
+        if (getFLGVersion(fn, &flg_ecs_ver)) {
+           if (flg_ecs_ver[0] == '2' && flg_ecs_ver[2] == '1')
+               os2ver = OV_ECS_2_1;
+           if (flg_ecs_ver[0] == '2' && flg_ecs_ver[2] == '2')
+               os2ver = OV_ECS_2_2;
+        }
+        return os2ver;
+    }
 
     return os2ver = OV_ECS_Unknown;
 }

src/corelib/global/qglobal.h

@@ -1566 +1566 @@
         OV_ECS_1_1      = 0x06010100,
         OV_ECS_1_2      = 0x06010200,
         OV_ECS_2_0      = 0x06020000,
+        OV_ECS_2_1      = 0x06020100,
+        OV_ECS_2_2      = 0x06020200,
 
         /* version masks */
         OV_WARP3        = 0x01000000,