Merge pull request #12 from alexarchambault/develop

Fix off-by-one error for too long env var values

.mill-version

@@ -1 +1 @@
-0.9.5
+0.9.12

build.sc

@@ -53,7 +53,7 @@ object `windows-jni-utils-tests` extends ScalaModule with JniUtilsPublishModule
       `windows-jni-utils-coursierapi`
     )
     def ivyDeps = Agg(Deps.utest)
-    def testFrameworks = Seq("utest.runner.Framework")
+    def testFramework = "utest.runner.Framework"
   }
 }
 

settings.sc

@@ -78,13 +78,18 @@ def toCrLfOpt(content: Array[Byte]): Option[Array[Byte]] = {
   }
 }
 
-private def vcVersions = Seq("2019", "2017")
+private def vcVersions = Seq("2022", "2019", "2017")
 private def vcEditions = Seq("Enterprise", "Community", "BuildTools")
+private def progFiles = Seq(
+  """C:\Program Files""",
+  """C:\Program Files (x86)"""
+)
 private lazy val vcvarsCandidates = Option(System.getenv("VCVARSALL")) ++ {
   for {
+    progFiles0 <- progFiles
     version <- vcVersions
     edition <- vcEditions
-  } yield """C:\Program Files (x86)\Microsoft Visual Studio\""" + version + "\\" + edition + """\VC\Auxiliary\Build\vcvars64.bat"""
+  } yield progFiles0 + """\Microsoft Visual Studio\""" + version + "\\" + edition + """\VC\Auxiliary\Build\vcvars64.bat"""
 }
 
 private def vcvarsOpt: Option[os.Path] =

windows-jni-utils/src/main/c/coursier_jniutils_WindowsEnvironmentVariables.c

@@ -60,6 +60,9 @@ JNIEXPORT jbyteArray JNICALL Java_coursier_jniutils_DefaultNativeApi_GetUserEnvi
   jbyte *data = NULL;
 
   if (status == ERROR_SUCCESS || status == ERROR_MORE_DATA) {
+    if (status == ERROR_MORE_DATA) {
+      size = size + 1; /* ??? */
+    }
     arr = (*env)->NewByteArray(env, size + 1);
     data = (*env)->GetByteArrayElements(env, arr, NULL);