infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8274087: Windows DLL path not set correctly.

Browse Source 
Reviewed-by: almatvee, asemenyuk
This commit is contained in:
Andy Herrick 2021-09-24 12:43:25 +00:00
parent 5ba0d09fe4
commit f36a2bbd15
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jdk.jpackage/windows/native/applauncher/WinLauncher.cpp
View File

@ -139,8 +139,6 @@ void launchApp() {
const tstring launcherPath = SysInfo::getProcessModulePath();
const tstring appImageRoot = FileUtils::dirname(launcherPath);
const tstring appDirPath = FileUtils::mkpath() << appImageRoot << _T("app");
const tstring runtimeBinPath = FileUtils::mkpath()
<< appImageRoot << _T("runtime") << _T("bin");
const AppLauncher appLauncher = AppLauncher().setImageRoot(appImageRoot)
.addJvmLibName(_T("bin\\jli.dll"))
@ -188,9 +186,11 @@ void launchApp() {
return;
}
// zip.dll may be loaded by java without full path
// zip.dll (and others) may be loaded by java without full path
// make sure it will look in runtime/bin
const tstring runtimeBinPath = FileUtils::dirname(jvm->getPath());
SetDllDirectory(runtimeBinPath.c_str());
LOG_TRACE(tstrings::any() << "SetDllDirectory to: " << runtimeBinPath);
const DllWrapper jliDll(jvm->getPath());
std::unique_ptr<DllWrapper> splashDll;