Changeset 3394 for trunk/src/kmk/variable.c

Timestamp:

Jul 1, 2020, 10:24:52 PM (5 years ago)

Author:

bird

Message:

kmk: Added version sort function: versort, rversort, versortfiles, rversortfiles, qversortfiles, qrversortfiles. Try get the real host version on windows by using RtlGetVersion.

File:

• trunk/src/kmk/variable.c (modified) (5 diffs)

trunk/src/kmk/variable.c

@@ -1606 +1606 @@
   struct variable *envvar1;
   struct variable *envvar2;
-# ifdef WINDOWS32
-  OSVERSIONINFOEX oix;
-# else
+# ifndef WINDOWS32
   struct utsname uts;
 # endif
@@ -1677 +1675 @@
 
   /* The host kernel version. */
-#if defined(WINDOWS32)
-  memset (&oix, '\0', sizeof (oix));
-  oix.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-  if (!GetVersionEx ((LPOSVERSIONINFO)&oix))
-    {
-      memset (&oix, '\0', sizeof (oix));
-      oix.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
-      GetVersionEx ((LPOSVERSIONINFO)&oix);
-    }
-  if (oix.dwPlatformId == VER_PLATFORM_WIN32_NT)
-    {
-      ulMajor = oix.dwMajorVersion;
-      ulMinor = oix.dwMinorVersion;
-      ulPatch = oix.wServicePackMajor;
-      ul4th   = oix.wServicePackMinor;
-    }
-  else
-    {
-      ulMajor = oix.dwPlatformId == 1 ? 0 /*Win95/98/ME*/
-              : oix.dwPlatformId == 3 ? 1 /*WinCE*/
-              : 2; /*??*/
-      ulMinor = oix.dwMajorVersion;
-      ulPatch = oix.dwMinorVersion;
-      ul4th   = oix.wServicePackMajor;
-    }
-#else
+# if defined(WINDOWS32)
+  {
+    OSVERSIONINFOEXW oix;
+    typedef NTSTATUS (WINAPI *pfnRtlGetVersion)(OSVERSIONINFOEXW *);
+    *(FARPROC *)&pfnRtlGetVersion = GetProcAddress (GetModuleHandleW ("NTDLL.DLL"),
+                                                    "RtlGetVersion"); /* GetVersionEx lies */
+    memset (&oix, '\0', sizeof (oix));
+    oix.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEX);
+    if (!pfnRtlGetVersion || pfnRtlGetVersion (&oix) < 0)
+      {
+        memset (&oix, '\0', sizeof (oix));
+        oix.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEX);
+        if (!GetVersionExW((LPOSVERSIONINFO)&oix))
+          {
+            memset (&oix, '\0', sizeof (oix));
+            oix.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
+            GetVersionExW ((LPOSVERSIONINFO)&oix);
+          }
+      }
+    if (oix.dwPlatformId == VER_PLATFORM_WIN32_NT)
+      {
+        ulMajor = oix.dwMajorVersion;
+        ulMinor = oix.dwMinorVersion;
+        ulPatch = oix.wServicePackMajor;
+        ul4th   = oix.wServicePackMinor;
+      }
+    else
+      {
+        ulMajor = oix.dwPlatformId == 1 ? 0 /*Win95/98/ME*/
+                : oix.dwPlatformId == 3 ? 1 /*WinCE*/
+                : 2; /*??*/
+        ulMinor = oix.dwMajorVersion;
+        ulPatch = oix.dwMinorVersion;
+        ul4th   = oix.wServicePackMajor;
+      }
+  }
+# else
   memset (&uts, 0, sizeof(uts));
   uname (&uts);
@@ -1716 +1725 @@
   define_variable_cname ("KBUILD_HOST_UNAME_MACHINE", uts.machine, o_default, 0);
   define_variable_cname ("KBUILD_HOST_UNAME_NODENAME", uts.nodename, o_default, 0);
-#endif
+# endif
 
   sprintf (buf, "%lu.%lu.%lu.%lu", ulMajor, ulMinor, ulPatch, ul4th);
@@ -1765 +1774 @@
   && defined (KMK_HELPERS)
   define_variable_cname ("KMK_FEATURES",
-                         "append-dash-n abspath includedep-queue install-hard-linking umask quote"
+                         "append-dash-n abspath includedep-queue install-hard-linking umask quote versort"
                          " kBuild-define"
                          " rsort"
@@ -1796 +1805 @@
 # else /* MSC can't deal with strings mixed with #if/#endif, thus the slow way. */
 #  error "All features should be enabled by default!"
-  strcpy (buf, "append-dash-n abspath includedep-queue install-hard-linking umask quote"
+  strcpy (buf, "append-dash-n abspath includedep-queue install-hard-linking umask quote versort"
                " kBuild-define");
 #  if defined (CONFIG_WITH_RSORT)