Changeset 3395 in kBuild for trunk

Timestamp:

Jul 2, 2020 8:30:25 AM (5 years ago)

Author:

bird

Message:

kmk/variable.c: Build fix. Added KBUILD_HOST_VERSION_BUILD for windows and appended the build number to the KMK_HOST_VERSION string too.

File:

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

trunk/src/kmk/variable.c

@@ -1678 +1678 @@
   {
     OSVERSIONINFOEXW oix;
-    typedef NTSTATUS (WINAPI *pfnRtlGetVersion)(OSVERSIONINFOEXW *);
-    *(FARPROC *)&pfnRtlGetVersion = GetProcAddress (GetModuleHandleW ("NTDLL.DLL"),
+    NTSTATUS (WINAPI *pfnRtlGetVersion)(OSVERSIONINFOEXW *);
+    *(FARPROC *)&pfnRtlGetVersion = GetProcAddress (GetModuleHandleW (L"NTDLL.DLL"),
                                                     "RtlGetVersion"); /* GetVersionEx lies */
     memset (&oix, '\0', sizeof (oix));
-    oix.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEX);
+    oix.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEXW);
     if (!pfnRtlGetVersion || pfnRtlGetVersion (&oix) < 0)
       {
         memset (&oix, '\0', sizeof (oix));
-        oix.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEX);
-        if (!GetVersionExW((LPOSVERSIONINFO)&oix))
+        oix.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEXW);
+        if (!GetVersionExW((LPOSVERSIONINFOW)&oix))
           {
             memset (&oix, '\0', sizeof (oix));
-            oix.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
-            GetVersionExW ((LPOSVERSIONINFO)&oix);
+            oix.dwOSVersionInfoSize = sizeof (OSVERSIONINFOW);
+            GetVersionExW ((LPOSVERSIONINFOW)&oix);
           }
       }
@@ -1710 +1710 @@
         ul4th   = oix.wServicePackMajor;
       }
+    oix.dwBuildNumber &= 0x3fffffff;
+    sprintf (buf, "%lu", oix.dwBuildNumber);
+    define_variable_cname ("KBUILD_HOST_VERSION_BUILD", buf, o_default, 0);
+
+    sprintf (buf, "%lu.%lu.%lu.%lu.%lu", ulMajor, ulMinor, ulPatch, ul4th, oix.dwBuildNumber);
+    define_variable_cname ("KBUILD_HOST_VERSION", buf, o_default, 0);
   }
 # else
@@ -1725 +1731 @@
   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
 
   sprintf (buf, "%lu.%lu.%lu.%lu", ulMajor, ulMinor, ulPatch, ul4th);
   define_variable_cname ("KBUILD_HOST_VERSION", buf, o_default, 0);
+# endif
 
   sprintf (buf, "%lu", ulMajor);