commit 460b44fcd58cbed1719f1ccdb385048dd00847a0
author Laszlo Csomor <laszlocsomor@google.com> Mon Apr 15 05:51:53 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Apr 15 05:53:09 2019 -0700
tree 2e6b717f08884844c4086bf2f7c76e3a115000d6
parent 5cd396c4a840e148cc3b7db664088f8f71f9be4f

Windows, JNI: update Windows version check

Using OSVERSIONINFOEX and GetVersionEx is
deprecated; use IsWindows8OrGreater() instead.

Closes #8039.

PiperOrigin-RevId: 243600203

src/main/native/windows/processes-jni.cc

diff --git a/src/main/native/windows/processes-jni.cc b/src/main/native/windows/processes-jni.cc
index 281fc85..906992c 100644
--- a/src/main/native/windows/processes-jni.cc
+++ b/src/main/native/windows/processes-jni.cc
@@ -18,6 +18,7 @@
 
 #include <wchar.h>
 #include <windows.h>
+#include <VersionHelpers.h>
 
 #include <atomic>
 #include <memory>
@@ -464,11 +465,12 @@
     if (!AssignProcessToJobObject(job_, process_)) {
       BOOL is_in_job = false;
       if (IsProcessInJob(process_, NULL, &is_in_job) && is_in_job &&
-          !NestedJobsSupported()) {
-        // We are on a pre-Windows 8 system and the Bazel is already in a job.
-        // We can't create nested jobs, so just revert to TerminateProcess() and
-        // hope for the best. In batch mode, the launcher puts Bazel in a job so
-        // that will take care of cleanup once the command finishes.
+          !IsWindows8OrGreater()) {
+        // Pre-Windows 8 systems don't support nested jobs, and Bazel is already
+        // in a job.  We can't create nested jobs, so just revert to
+        // TerminateProcess() and hope for the best. In batch mode, the launcher
+        // puts Bazel in a job so that will take care of cleanup once the
+        // command finishes.
         CloseHandle(job_);
         job_ = INVALID_HANDLE_VALUE;
         CloseHandle(ioport_);
@@ -525,7 +527,7 @@
     // above timed out, we have to explicitly kill it) and that it doesn't
     // leave behind any subprocesses.
     if (!Terminate()) {
-      return 2;
+      return kWaitError;
     }
 
     if (job_ != INVALID_HANDLE_VALUE) {
@@ -662,18 +664,6 @@
   }
 
  private:
-  bool NestedJobsSupported() {
-    OSVERSIONINFOEX version_info;
-    version_info.dwOSVersionInfoSize = sizeof(version_info);
-    if (!GetVersionEx(reinterpret_cast<OSVERSIONINFO*>(&version_info))) {
-      return false;
-    }
-
-    return version_info.dwMajorVersion > 6 ||
-           (version_info.dwMajorVersion == 6 &&
-            version_info.dwMinorVersion >= 2);
-  }
-
   HANDLE stdin_;
   NativeOutputStream stdout_;
   NativeOutputStream stderr_;