Changeset 1109 for trunk/src/corelib/global

Timestamp:

Nov 19, 2012, 6:11:27 PM (13 years ago)

Author:

Silvan Scherrer

Message:

enhance QSysInfo with ecs 2.1 and 2.2

Location:

trunk/src/corelib/global

Files:

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

trunk/src/corelib/global/qglobal.cpp

@@ -1272 +1272 @@
     \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
@@ -1972 +1974 @@
 // 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])
+// 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
+// the below function deals with both
+enum FileType {
+    SysLevel,
+    eCSFlg };
+
+static bool getSyslevelVersion(const QByteArray &fileName, FileType ft, char *version)
 {
     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;
+    // go to the  data structure
+    if ((success = fseek(f, , SEEK_SET) == 0)) {
+        // read in  bytes
+        success = fread(;
     }
     fclose(f);
@@ -2026 +2047 @@
     fn.data()[0] += buf[0] - 1;
     char sys_os2_ver[2];
-    if (!getSyslevelVersion(fn, &sys_os2_ver))
+    if (!getSyslevelVersion(fn, sys_os2_ver))
         return os2ver;
 
@@ -2033 +2054 @@
     fn.data()[0] += buf[0] - 1;
     char sys_ecs_ver[2];
-    if (!getSyslevelVersion(fn, &sys_ecs_ver)) {
+    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;
@@ -2050 +2071 @@
             return os2ver = OV_ECS_1_0;
         // detect WSeB (4.52)
-        if (sys_os2_ver[0] == 0x45 &&sys_os2_ver[1] == 0x02)
+        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)
@@ -2059 +2080 @@
     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 (getSyslevelVersion(fn, eCSFlg, 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;

trunk/src/corelib/global/qglobal.h

@@ -1567 +1567 @@
         OV_ECS_1_2      = 0x06010200,
         OV_ECS_2_0      = 0x06020000,
+
+
 
         /* version masks */