1.5.0

Author: Bill-Stewart

GetJavaInfo.md

@@ -32,6 +32,7 @@ Without command-line parameters, GetJavaInfo outputs Java installation details.
 | ------------------ | ------------ | -------------------------------------
 | `--javainstalled`  | `-i`         | Tests if Java is installed
 | `--javahome`       | `-H`         | Outputs Java home directory
+| `--javadll`        | `-d`         | Outputs jvm.dll path
 | `--javaversion`    | `-V`         | Outputs Java version
 | `--javais64bit`    | `-b`         | Tests if Java is 64-bit
 | `--version`        | `-v`         | Outputs this program's version number
@@ -101,7 +102,7 @@ In this example, GetJavaInfo will return one of the following exit codes:
         :END
         endlocal
 
-    This script sets the `_JHOME` environment variable to the Java home directory if Java is installed. The variable will not be set if Java is not instaled.
+    This script sets the `_JHOME` environment variable within the script to the Java home directory if Java is installed. The variable will not be set if Java is not instaled.
 
 3.  Sample batch file (cmd.exe shell script) for checking whether Java is installed and is at least a minimum version:
 
@@ -120,3 +121,18 @@ In this example, GetJavaInfo will return one of the following exit codes:
         echo Java is not installed
         :END
         endlocal
+
+4.  Sample batch file (cmd.exe shell script) for getting the path and filename of jvm.dll in an environment variable:
+
+        @echo off
+        setlocal enableextensions
+        GetJavaInfo -i -q
+        if errorlevel 2 goto :NOJAVA
+        set _JVMPATH=
+        for /f "delims=" %%a in ('GetJavaInfo --javadll') do set _JVMPATH=%%a
+        echo jvm.dll path: %_JVMPATH%
+        goto :END
+        :NOJAVA
+        echo Java is not installed
+        :END
+        endlocal

GetJavaInfo.pp

@@ -41,6 +41,7 @@
     ArgVersion:        Boolean;        // --version/v
     ArgJavaIs64Bit:    Boolean;        // --javais64bit/-b
     ArgJavaHome:       Boolean;        // --javahome/-H
+    ArgJavaDLL:        Boolean;        // --javadll/-d
     ArgJavaInstalled:  Boolean;        // --javainstalled/-i
     ArgJavaMinVersion: UnicodeString;  // --javaminversion/-m
     ArgJavaVersion:    Boolean;        // --javaversion/-V
@@ -50,7 +51,7 @@
 var
   CommandLine: TCommandLine;
   JavaDetected, JavaIs64Bit, VersionOK: Boolean;
-  JavaHome, JavaVersion, OutputStr: UnicodeString;
+  JavaHome, JavaJVMPath, JavaVersion, OutputStr: UnicodeString;
 
 procedure Usage();
 const
@@ -71,6 +72,7 @@ procedure Usage();
     + '----------------  -------  -------------------------------------' + NEWLINE
     + '--javainstalled   -i       Tests if Java is installed' + NEWLINE
     + '--javahome        -H       Outputs Java home directory' + NEWLINE
+    + '--javadll         -d       Outputs jvm.dll path' + NEWLINE
     + '--javaversion     -V       Outputs Java version' + NEWLINE
     + '--javais64bit     -b       Tests if Java is 64-bit' + NEWLINE
     + '--version         -v       Outputs this program''s version number' + NEWLINE
@@ -102,7 +104,7 @@ procedure Usage();
 
 procedure TCommandLine.Parse();
 var
-  LongOpts: array[1..9] of TOption;
+  LongOpts: array[1..10] of TOption;
   Opt: Char;
   I: LongInt;
 begin
@@ -117,10 +119,10 @@ procedure TCommandLine.Parse();
   end;
   with LongOpts[2] do
   begin
-    Name := 'help';
+    Name := 'javadll';
     Has_arg := No_Argument;
-    Flag := nil;
-    Value := 'h';
+    flag := nil;
+    Value := 'd';
   end;
   with LongOpts[3] do
   begin
@@ -130,41 +132,48 @@ procedure TCommandLine.Parse();
     Value := 'H';
   end;
   with LongOpts[4] do
+  begin
+    Name := 'help';
+    Has_arg := No_Argument;
+    Flag := nil;
+    Value := 'h';
+  end;
+  with LongOpts[5] do
   begin
     Name := 'javainstalled';
     Has_arg := No_Argument;
     Flag := nil;
     Value := 'i';
   end;
-  with LongOpts[5] do
+  with LongOpts[6] do
   begin
     Name := 'javaminversion';
     Has_arg := Required_Argument;
     Flag := nil;
     Value := 'm';
   end;
-  with LongOpts[6] do
+  with LongOpts[7] do
   begin
     Name := 'quiet';
     Has_arg := No_Argument;
     Flag := nil;
     Value := 'q';
   end;
-  with LongOpts[7] do
+  with LongOpts[8] do
   begin
     Name := 'javaversion';
     Has_arg := No_Argument;
     Flag := nil;
     Value := 'V';
   end;
-  with LongOpts[8] do
+  with LongOpts[9] do
   begin
     Name := 'version';
     Has_arg := No_Argument;
     Flag := nil;
     Value := 'v';
   end;
-  with LongOpts[9] do
+  with LongOpts[10] do
   begin
     Name := '';
     Has_arg := No_Argument;
@@ -179,16 +188,18 @@ procedure TCommandLine.Parse();
   ArgVersion := false;        // --version/v
   ArgJavaIs64Bit := false;    // --javais64bit/-b
   ArgJavaHome := false;       // --javahome/-H
+  ArgJavaDLL := false;        // --javadll/-d
   ArgJavaInstalled := false;  // --javainstalled/-i
   ArgJavaMinVersion := '';    // --javaminversion/-m
   ArgJavaVersion := false;    // --javaversion/-V
   OptErr := false;  // no error outputs from getopts
   repeat
-    Opt := GetLongOpts('bhHim:qVv', @LongOpts, I);
+    Opt := GetLongOpts('bdHhim:qVv', @LongOpts, I);
     case Opt of
       'b': ArgJavaIs64Bit := true;
-      'h': ArgHelp := true;
+      'd': ArgJavaDLL := true;
       'H': ArgJavaHome := true;
+      'h': ArgHelp := true;
       'i': ArgJavaInstalled := true;
       'm': ArgJavaMinVersion := StringToUnicodeString(OptArg, CP_ACP);
       'q': ArgQuiet := true;
@@ -247,13 +258,15 @@ function BoolToStr(const B: Boolean): UnicodeString;
   // Initialize variables
   JavaDetected := wsIsJavaInstalled();
   JavaHome := '';
+  JavaJVMPath := '';
   JavaVersion := '';
   JavaIs64Bit := false;
 
   // Get details if Java was detected
   if JavaDetected then
   begin
     JavaHome := wsGetJavaHome();
+    JavaJVMPath := wsGetJavaJVMPath();
     JavaVersion := wsGetJavaVersion();
     if wsIsBinary64Bit(JavaHome + '\bin\java.exe', JavaIs64Bit) <> 0 then
       JavaIs64Bit := false;
@@ -321,18 +334,21 @@ function BoolToStr(const B: Boolean): UnicodeString;
     end;
   end;
 
-  if not (CommandLine.ArgJavaHome or CommandLine.ArgJavaVersion) then
+  if not (CommandLine.ArgJavaHome or CommandLine.ArgJavaDLL or CommandLine.ArgJavaVersion) then
   begin
     OutputStr := 'Java home:' + #9 + JavaHome + NEWLINE
+      + 'jvm.dll path:' + #9 + JavaJVMPath + NEWLINE
       + 'Java version:' + #9 + JavaVersion + NEWLINE
       + 'Java is 64-bit:' + #9 + BoolToStr(JavaIs64Bit);
     WriteLn(OutputStr);
     exit();
   end;
 
-  // --javahome/-H or --javaversion/-V
+  // --javahome/-H or --javadll/-d or --javaversion/-V
   if CommandLine.ArgJavaHome then
     WriteLn(JavaHome)
+  else if CommandLine.ArgJavaDLL then
+    WriteLn(JavaJVMPath)
   else if CommandLine.ArgJavaVersion then
     WriteLn(JavaVersion);
 end.

GetJavaInfo.rc

@@ -1,6 +1,6 @@
 1 VERSIONINFO
-FILEVERSION 1,4,0,0
-PRODUCTVERSION 1,4,0,0
+FILEVERSION 1,5,0,0
+PRODUCTVERSION 1,5,0,0
 FILEOS 0x4
 FILETYPE 1
 {
@@ -10,12 +10,12 @@ FILETYPE 1
     {
       VALUE "CompanyName", ""
       VALUE "FileDescription", "GetJavaInfo.exe"
-      VALUE "FileVersion", "1.4.0.0"
+      VALUE "FileVersion", "1.5.0.0"
       VALUE "InternalName", "GetJavaInfo.exe"
       VALUE "LegalCopyright", "Copyright 2020-2023 by Bill Stewart (bstewart at iname.com)"
       VALUE "OriginalFilename", "GetJavaInfo.exe"
       VALUE "ProductName", ""
-      VALUE "ProductVersion", "1.4.0.0"
+      VALUE "ProductVersion", "1.5.0.0"
     }
   }
 

JavaInfo.pp

@@ -1,4 +1,4 @@
-{ Copyright (C) 2020-2021 by Bill Stewart (bstewart at iname.com)
+{ Copyright (C) 2020-2023 by Bill Stewart (bstewart at iname.com)
 
   This program is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the Free
@@ -16,8 +16,9 @@
 }
 
 {
-  Note Regarding the GetJavaHome() and GetJavaVersion() Functions
-  ===============================================================
+  Note Regarding the GetJavaHome(), GetJavaJVMPath(), and GetJavaVersion()
+  Functions
+  ========================================================================
   You must allocate a buffer to get the result strings from these functions. To
   determine the required buffer size, call the function with a null pointer for
   the first parameter and 0 for the second parameter. The function will return
@@ -107,6 +108,15 @@ function GetJavaHome(PathName: PWideChar; NumChars: DWORD): DWORD; stdcall;
   result := GetString(StringFunction, PathName, NumChars);
 end;
 
+// Gets path of jvm.dll into string buffer pointed to by PathName.
+function GetJavaJVMPath(PathName: PWideChar; NumChars: DWORD): DWORD; stdcall;
+var
+  StringFunction: TStringFunction;
+begin
+  StringFunction := @wsGetJavaJVMPath;
+  result := GetString(StringFunction, PathName, NumChars);
+end;
+
 // Gets Java version string (a.b.c.d) into string buffer pointed to by Version.
 function GetJavaVersion(Version: PWideChar; NumChars: DWORD): DWORD; stdcall;
 var
@@ -164,6 +174,7 @@ function IsJavaMinimumVersion(Version: PWideChar; VersionOK: PDWORD): DWORD; std
 
 exports
   GetJavaHome,
+  GetJavaJVMPath,
   GetJavaVersion,
   IsBinary64Bit,
   IsJavaInstalled,

JavaInfo.rc

@@ -1,6 +1,6 @@
 1 VERSIONINFO
-FILEVERSION 1,4,0,0
-PRODUCTVERSION 1,4,0,0
+FILEVERSION 1,5,0,0
+PRODUCTVERSION 1,5,0,0
 FILEOS 0x4
 FILETYPE 1
 {
@@ -10,12 +10,12 @@ FILETYPE 1
     {
       VALUE "CompanyName", ""
       VALUE "FileDescription", "JavaInfo.dll"
-      VALUE "FileVersion", "1.4.0.0"
+      VALUE "FileVersion", "1.5.0.0"
       VALUE "InternalName", "JavaInfo.dll"
       VALUE "LegalCopyright", "Copyright 2020-2023 by Bill Stewart (bstewart at iname.com)"
       VALUE "OriginalFilename", "JavaInfo.dll"
       VALUE "ProductName", ""
-      VALUE "ProductVersion", "1.4.0.0"
+      VALUE "ProductVersion", "1.5.0.0"
     }
   }
 

JavaInfoTest.iss

@@ -25,7 +25,7 @@
 
 [Setup]
 AppName=JavaInfoTest
-AppVersion=1.4.0.0
+AppVersion=1.5.0.0
 UsePreviousAppDir=false
 DefaultDirName={autopf}\JavaInfoTest
 Uninstallable=false
@@ -57,6 +57,8 @@ function DLLIsJavaMinimumVersion(Version: string; var VersionOK: DWORD): DWORD;
   external 'IsJavaMinimumVersion@files:JavaInfo.dll stdcall setuponly';
 function DLLGetJavaHome(PathName: string; NumChars: DWORD): DWORD;
   external 'GetJavaHome@files:JavaInfo.dll stdcall setuponly';
+function DLLGetJavaJVMPath(PathName: string; NumChars: DWORD): DWORD;
+  external 'GetJavaJVMPath@files:JavaInfo.dll stdcall setuponly';
 function DLLGetJavaVersion(Version: string; NumChars: DWORD): DWORD;
   external 'GetJavaVersion@files:JavaInfo.dll stdcall setuponly';
 // Note that 'var' parameters above are pointers
@@ -105,6 +107,19 @@ begin
     result := OutStr;
 end;
 
+// Wrapper for GetJavaJVMPath() DLL function (same note as above)
+function GetJavaJVMPath(): string;
+var
+  NumChars: DWORD;
+  OutStr: string;
+begin
+  result := '';
+  NumChars := DLLGetJavaJVMPath('', 0);
+  SetLength(OutStr, NumChars);
+  if DLLGetJavaJVMPath(OutStr, NumChars) > 0 then
+    result := OutStr;
+end;
+
 // Wrapper for GetJavaVersion() DLL function (same note as above)
 function GetJavaVersion(): string;
 var
@@ -222,7 +237,7 @@ end;
 
 function NextButtonClick(CurPageID: Integer): Boolean;
 var
-  MinVersion, JavaHome, Message: string;
+  MinVersion, JavaHome, JavaJVMPath, Message: string;
 begin
   result := true;
   // Check if current page is the custom Java version page
@@ -241,6 +256,7 @@ begin
     begin
       JavaHome := GetJavaHome();
       Message := 'Java home: ' + JavaHome + #10
+        + 'Java JVM path: ' + GetJavaJVMPath + #10
         + 'Java version: ' + GetJavaVersion() + #10
         + 'Java is 64-bit: ' + BoolToStr(IsBinary64Bit(JavaHome + '\bin\java.exe')) + #10
         + 'At least version ' + MinVersion + ': ' + IsJavaMinimumVersion(MinVersion);

JavaInfoTest.pp

@@ -1,4 +1,4 @@
-{ Copyright (C) 2020-2021 by Bill Stewart (bstewart at iname.com)
+{ Copyright (C) 2020-2023 by Bill Stewart (bstewart at iname.com)
 
   This program is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the Free
@@ -32,9 +32,9 @@
 var
   DLLHandle: HMODULE;
   IsJavaInstalled: TGetDWORD;
-  GetJavaHome, GetJavaVersion: TGetString;
+  GetJavaHome, GetJavaJVMPath, GetJavaVersion: TGetString;
   IsBinary64Bit: TIsBinary64Bit;
-  JavaHome, JavaBinary, JavaVersion, BinaryType, Msg: UnicodeString;
+  JavaHome, JavaBinary, JavaJVMPath, JavaVersion, BinaryType, Msg: UnicodeString;
   Is64Bit: DWORD;
 
 procedure MsgBox(const Msg: UnicodeString; const MsgBoxType: UINT);
@@ -66,6 +66,7 @@ function GetString(var Func: TGetString): UnicodeString;
     exit();
   end;
   GetJavaHome := TGetString(GetProcAddress(DLLHandle, 'GetJavaHome'));
+  GetJavaJVMPath := TGetString(GetProcAddress(DLLHandle, 'GetJavaJVMPath'));
   GetJavaVersion := TGetString(GetProcAddress(DLLHandle, 'GetJavaVersion'));
   IsBinary64Bit := TIsBinary64Bit(GetProcAddress(DLLHandle, 'IsBinary64Bit'));
   IsJavaInstalled := TGetDWORD(GetProcAddress(DLLHandle, 'IsJavaInstalled'));
@@ -84,9 +85,12 @@ function GetString(var Func: TGetString): UnicodeString;
     end
     else
       BinaryType := 'unknown';
+    JavaJVMPath := GetString(GetJavaJVMPath);
     JavaVersion := GetString(GetJavaVersion);
-    Msg := 'Java home: ' + JavaHome + #10 + 'Java file version: ' + JavaVersion + #10 +
-      'Platform: ' + BinaryType;
+    Msg := 'Java home: ' + JavaHome + #10
+      + 'jvm.dll path: ' + JavaJVMPath + #10
+      + 'Java file version: ' + JavaVersion + #10
+      + 'Platform: ' + BinaryType;
     MsgBox(Msg, 0);
   end;
   FreeLibrary(DLLHandle);