Changeset 146 for trunk

Timestamp:

Sep 5, 2010, 8:21:09 PM (15 years ago)

Author:

dmik

Message:

jdk: Return correct values for os.name, os.version, sun.os.patch.level and sun.desktop properties.

File:

• trunk/openjdk/jdk/src/windows/native/java/lang/java_props_md.c (modified) (3 diffs)

trunk/openjdk/jdk/src/windows/native/java/lang/java_props_md.c

@@ -23 +23 @@
  * have any questions.
  */
+
+#ifdef __WIN32OS2__
+#define INCL_DOSMISC
+#include <os2wrap2.h>
+#endif
 
 #include <windows.h>
@@ -687 +692 @@
     /* OS properties */
     {
+#ifdef __WIN32OS2__
+        /* When reporting the OS name and version, we omit the fact that we run
+         * under Odin (that would report itself as a Windows system) and return
+         * the actual OS/2 values which makes more sense. */
+
+        char buf[100];
+
+        sprops.os_name = "OS/2";
+
+        os2_ULONG ver[3];
+        DosQuerySysInfo(os2_QSV_VERSION_MAJOR, os2_QSV_VERSION_REVISION,
+                        &ver, sizeof(ver));
+        sprintf(buf, "%lu.%lu", ver[0], ver[1]);
+        sprops.os_version = strdup(buf);
+        sprintf(buf, "%lu", ver[3]);
+        sprops.patch_level = strdup(buf);
+
+        sprops.os_arch = "x86";
+        sprops.desktop = "pm";
+#else /* __WIN32OS2__ */
         char buf[100];
         OSVERSIONINFOEX ver;
@@ -830 +855 @@
 
         sprops.desktop = "windows";
+#endif /* __WIN32OS2__ */
     }