Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-25 01:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpiutil] Add method to skip SetDllDirectory for windows loading (#6662)

Browse Source 
With DependentLoadFlags, we shouldn't need this function anymore. Add a way to test this easily without needing to modify allwpilib.
This commit is contained in:
Thad House
2024-05-26 14:22:29 -07:00
committed by GitHub
parent a2f2502f70
commit 958387ddd3
1 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
wpiutil/src/main/java/edu/wpi/first/util/CombinedRuntimeLoader.java
View File

@@ -20,6 +20,21 @@ import java.util.Objects;
public final class CombinedRuntimeLoader {
private CombinedRuntimeLoader() {}
private static boolean skipSetDllDirectory;
/**
* Flag to test not setting DLL directory for loading.
*
* @param skip Skip setting DLL directory
*/
public static synchronized void setSkipSetDllDirectory(boolean skip) {
skipSetDllDirectory = skip;
}
private static synchronized boolean getSkipSetDllDirectory() {
return skipSetDllDirectory;
}
private static String extractionDirectory;
/**
@@ -102,6 +117,14 @@ public final class CombinedRuntimeLoader {
*/
public static native String setDllDirectory(String directory);
private static String setDllDirectoryShim(String directory) {
if (getSkipSetDllDirectory()) {
return null;
} else {
return setDllDirectory(directory);
}
}
private static String getLoadErrorMessage(String libraryName, UnsatisfiedLinkError ule) {
StringBuilder msg = new StringBuilder(512);
msg.append(libraryName)
@@ -202,7 +225,7 @@ public final class CombinedRuntimeLoader {
try {
if (System.getProperty("os.name").startsWith("Windows")) {
var extractionPathString = getExtractionDirectory();
oldDllDirectory = setDllDirectory(extractionPathString);
oldDllDirectory = setDllDirectoryShim(extractionPathString);
}
for (var extractedFile : extractedFiles) {
if (extractedFile.contains(libraryName)) {
@@ -217,7 +240,7 @@ public final class CombinedRuntimeLoader {
throw new IOException(getLoadErrorMessage(currentPath, ule));
} finally {
if (oldDllDirectory != null) {
setDllDirectory(oldDllDirectory);
setDllDirectoryShim(oldDllDirectory);
}
}
}
@@ -238,15 +261,17 @@ public final class CombinedRuntimeLoader {
String currentPath = "";
try {
if (System.getProperty("os.name").startsWith("Windows")) {
var extractionPathString = getExtractionDirectory();
// Load windows, set dll directory
currentPath = Paths.get(extractionPathString, "WindowsLoaderHelper.dll").toString();
System.load(currentPath);
if (!getSkipSetDllDirectory()) {
try {
if (System.getProperty("os.name").startsWith("Windows")) {
var extractionPathString = getExtractionDirectory();
// Load windows, set dll directory
currentPath = Paths.get(extractionPathString, "WindowsLoaderHelper.dll").toString();
System.load(currentPath);
}
} catch (UnsatisfiedLinkError ule) {
throw new IOException(getLoadErrorMessage(currentPath, ule));
}
} catch (UnsatisfiedLinkError ule) {
throw new IOException(getLoadErrorMessage(currentPath, ule));
}
for (var library : librariesToLoad) {