Muldersoft/Launch5j
Muldersoft/Launch5j
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Some fixes to OpenJDK registry detection.

Browse Source
This commit is contained in:
LoRd_MuldeR 2020-10-02 20:49:13 +02:00
parent 04a2723b67
commit e52bbc740e
2 changed files with 38 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.cmd
View File

@ -84,6 +84,10 @@ if not "%ERRORLEVEL%"=="0" (
goto:eof goto:eof
) )
echo ========================================================================
echo Creating ZIP
echo ========================================================================
echo.
"%~dp0.\etc\utils\win32\info-zip\zip.exe" -r -9 "%OUTFILE%" "*.*" "%~dp0.\etc\utils\win32\info-zip\zip.exe" -r -9 "%OUTFILE%" "*.*"
if not "%ERRORLEVEL%"=="0" ( if not "%ERRORLEVEL%"=="0" (

53
src/head.c
View File

@ -957,7 +957,7 @@ static BOOL detect_java_runtime_scan_liberica(const wchar_t *const key_name, con
const DWORD value_major = reg_read_dword(context_ptr->registry.root_key, full_reg_path, L"MajorVersion", context_ptr->registry.view_64bit, 0U); const DWORD value_major = reg_read_dword(context_ptr->registry.root_key, full_reg_path, L"MajorVersion", context_ptr->registry.view_64bit, 0U);
const DWORD value_minor = reg_read_dword(context_ptr->registry.root_key, full_reg_path, L"MinorVersion", context_ptr->registry.view_64bit, 0U); const DWORD value_minor = reg_read_dword(context_ptr->registry.root_key, full_reg_path, L"MinorVersion", context_ptr->registry.view_64bit, 0U);
const DWORD value_build = reg_read_dword(context_ptr->registry.root_key, full_reg_path, L"BuildNumber", context_ptr->registry.view_64bit, 0U); const DWORD value_build = reg_read_dword(context_ptr->registry.root_key, full_reg_path, L"BuildNumber", context_ptr->registry.view_64bit, 0U);
const ULONGLONG version = (((ULONGLONG)(value_major & 0xFFFF)) << 48) | (((ULONGLONG)(value_major & 0xFFFF)) << 16) | ((ULONGLONG)(value_build & 0xFFFF)); const ULONGLONG version = (((ULONGLONG)(value_major & 0xFFFF)) << 48) | (((ULONGLONG)(value_minor & 0xFFFF)) << 16) | ((ULONGLONG)(value_build & 0xFFFF));
if ((version >= context_ptr->required.ver_min) && (version < context_ptr->required.ver_max) && (version > context_ptr->result.version)) if ((version >= context_ptr->required.ver_min) && (version < context_ptr->required.ver_max) && (version > context_ptr->result.version))
{ {
const wchar_t *java_runtime_path; const wchar_t *java_runtime_path;
@ -982,39 +982,42 @@ static BOOL detect_java_runtime_scan_liberica(const wchar_t *const key_name, con
return TRUE; return TRUE;
} }
static const wchar_t *detect_java_runtime_loop(const BOOL reg_view_64bit, const DWORD required_bitness, const ULONGLONG required_ver_min, const ULONGLONG required_ver_max) static const wchar_t *detect_java_runtime(const DWORD required_bitness, const ULONGLONG required_ver_min, const ULONGLONG required_ver_max)
{ {
typedef struct { INT32 mode; const wchar_t *path; } reg_key_t; typedef struct { UINT mode; const wchar_t *path; } reg_key_t;
static const reg_key_t REG_KEYS[] = static const reg_key_t REG_KEYS[] =
{ {
{ 1, L"SOFTWARE\\JavaSoft\\Java Runtime Environment" }, { 1, L"SOFTWARE\\JavaSoft\\JRE" }, { 2, L"SOFTWARE\\AdoptOpenJDK\\JRE" }, { 1U, L"SOFTWARE\\JavaSoft\\Java Runtime Environment" }, { 1U, L"SOFTWARE\\JavaSoft\\JRE" }, { 2U, L"SOFTWARE\\AdoptOpenJDK\\JRE" },
{ 1, L"SOFTWARE\\JavaSoft\\Java Development Kit" }, { 1, L"SOFTWARE\\JavaSoft\\JDK" }, { 2, L"SOFTWARE\\AdoptOpenJDK\\JDK" }, { 1U, L"SOFTWARE\\JavaSoft\\Java Development Kit" }, { 1U, L"SOFTWARE\\JavaSoft\\JDK" }, { 2U, L"SOFTWARE\\AdoptOpenJDK\\JDK" },
{ 3, L"SOFTWARE\\BellSoft\\Liberica"}, { 3U, L"SOFTWARE\\BellSoft\\Liberica"},
{ 0, NULL } { 0U, NULL }
}; };
const wchar_t *runtime_path = NULL; const wchar_t *runtime_path = NULL;
DWORD bitness = 0U; DWORD bitness = 0U;
ULONGLONG version = 0U; ULONGLONG version = 0U;
for (size_t i = 0; REG_KEYS[i].mode && REG_KEYS[i].path; ++i) for (UINT i = running_on_64bit() ? 0U : 1U; i < 2U; ++i)
{
const BOOL reg_view_64bit = (i < 1U);
for (size_t j = 0U; REG_KEYS[j].mode && REG_KEYS[j].path; ++j)
{ {
java_home_t search_state = java_home_t search_state =
{ {
{ required_bitness, required_ver_min, required_ver_max }, { required_bitness, required_ver_min, required_ver_max },
{ HKEY_LOCAL_MACHINE, REG_KEYS[i].path, reg_view_64bit }, { HKEY_LOCAL_MACHINE, REG_KEYS[j].path, reg_view_64bit },
{ bitness, version, NULL } { bitness, version, NULL }
}; };
switch(REG_KEYS->mode) switch(REG_KEYS[j].mode)
{ {
case 1: case 1U:
reg_enum_subkeys(HKEY_LOCAL_MACHINE, REG_KEYS[i].path, reg_view_64bit, detect_java_runtime_scan_javasoft, (ULONG_PTR)&search_state); reg_enum_subkeys(HKEY_LOCAL_MACHINE, REG_KEYS[j].path, reg_view_64bit, detect_java_runtime_scan_javasoft, (ULONG_PTR)&search_state);
break; break;
case 2: case 2U:
reg_enum_subkeys(HKEY_LOCAL_MACHINE, REG_KEYS[i].path, reg_view_64bit, detect_java_runtime_scan_adoptjdk, (ULONG_PTR)&search_state); reg_enum_subkeys(HKEY_LOCAL_MACHINE, REG_KEYS[j].path, reg_view_64bit, detect_java_runtime_scan_adoptjdk, (ULONG_PTR)&search_state);
break; break;
case 3: case 3U:
reg_enum_subkeys(HKEY_LOCAL_MACHINE, REG_KEYS[i].path, reg_view_64bit, detect_java_runtime_scan_liberica, (ULONG_PTR)&search_state); reg_enum_subkeys(HKEY_LOCAL_MACHINE, REG_KEYS[j].path, reg_view_64bit, detect_java_runtime_scan_liberica, (ULONG_PTR)&search_state);
break; break;
} }
if(search_state.result.runtime_path) if(search_state.result.runtime_path)
@ -1024,6 +1027,7 @@ static const wchar_t *detect_java_runtime_loop(const BOOL reg_view_64bit, const
SET_STRING(runtime_path, search_state.result.runtime_path); SET_STRING(runtime_path, search_state.result.runtime_path);
} }
} }
}
if (((required_bitness == 0U) || (bitness == required_bitness)) && (version >= required_ver_min) && (version < required_ver_max) && runtime_path) if (((required_bitness == 0U) || (bitness == required_bitness)) && (version >= required_ver_min) && (version < required_ver_max) && runtime_path)
{ {
@ -1034,23 +1038,6 @@ static const wchar_t *detect_java_runtime_loop(const BOOL reg_view_64bit, const
return NULL; return NULL;
} }
static const wchar_t *detect_java_runtime(const DWORD required_bitness, const ULONGLONG required_ver_min, const ULONGLONG required_ver_max)
{
const wchar_t *java_runtime_path;
if (running_on_64bit())
{
if ((java_runtime_path = detect_java_runtime_loop(TRUE, required_bitness, required_ver_min, required_ver_max)))
{
return java_runtime_path;
}
}
if ((java_runtime_path = detect_java_runtime_loop(FALSE, required_bitness, required_ver_min, required_ver_max)))
{
return java_runtime_path;
}
return NULL;
}
static const ULONGLONG load_java_version(const HINSTANCE hinstance, const UINT id, const ULONGLONG fallback) static const ULONGLONG load_java_version(const HINSTANCE hinstance, const UINT id, const ULONGLONG fallback)
{ {
ULONGLONG value = fallback; ULONGLONG value = fallback;